From fd5dae395b8aa45c103671462af51aaa98cd8303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= <pbos@webrtc.org>
Date: Thu, 26 Nov 2015 12:54:24 +0100
Subject: [PATCH] Build/use constructormagic.h unconditionally.

These macros no longer collide with Chromium since they are prefixed
with RTC_.

BUG=
R=henrikg@webrtc.org

Review URL: https://codereview.webrtc.org/1477013003 .

Cr-Commit-Position: refs/heads/master@{#10801}
---
 webrtc/base/BUILD.gn | 2 +-
 webrtc/base/base.gyp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index db762250a3..6d51003fed 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -115,6 +115,7 @@ static_library("rtc_base_approved") {
     "byteorder.h",
     "checks.cc",
     "checks.h",
+    "constructormagic.h",
     "criticalsection.cc",
     "criticalsection.h",
     "event.cc",
@@ -162,7 +163,6 @@ static_library("rtc_base_approved") {
     include_dirs = [ "../../webrtc_overrides" ]
   } else {
     sources += [
-      "constructormagic.h",
       "logging.cc",
       "logging.h",
     ]
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 1158984e10..44aff84c43 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -395,7 +395,6 @@
             'bandwidthsmoother.h',
             'bind.h',
             'callback.h',
-            'constructormagic.h',
             'dbus.cc',
             'dbus.h',
             'diskcache_win32.cc',