Fix style violations in common_types.h and config.h

Mostly, it's about moving constructors and descructors to the .cc
files, so that they won't be inlined everywhere.

The reason this CL is so big is that a lot of code was using
common_types.h without declaring a dependency on webrtc_common, which
broke the build once common_types.h started to depend on
common_types.cc.

BUG=163
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/26089004

Cr-Commit-Position: refs/heads/master@{#8516}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8516 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/libjingle.gyp

@@ -377,6 +377,7 @@
       'dependencies': [
         '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
         '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/modules/modules.gyp:video_render_module',
         '<(webrtc_root)/webrtc.gyp:webrtc',
         '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',

talk/libjingle_examples.gyp

@@ -75,6 +75,7 @@
         'examples/peerconnection/server/utils.h',
       ],
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         'libjingle.gyp:libjingle',
       ],
       # TODO(ronghuawu): crbug.com/167187 fix size_t to int truncations.

talk/libjingle_tests.gyp

@@ -192,6 +192,7 @@
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         'libjingle.gyp:libjingle',
         'libjingle.gyp:libjingle_p2p',
         'libjingle.gyp:libjingle_peerconnection',

webrtc/BUILD.gn

@@ -240,6 +240,7 @@ if (!build_with_chromium) {
 
 source_set("webrtc_common") {
   sources = [
+    "common_types.cc",
     "common_types.h",
     "config.h",
     "config.cc",
@@ -247,12 +248,6 @@ source_set("webrtc_common") {
     "typedefs.h",
   ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   configs += [ ":common_config" ]
   public_configs = [ ":common_inherited_config" ]
 }

webrtc/base/BUILD.gn

@@ -300,6 +300,8 @@ static_library("rtc_base") {
       "../overrides/webrtc/base/logging.h",
     ]
 
+    deps += [ "..:webrtc_common" ]
+
     if (is_win) {
       sources += [ "../overrides/webrtc/base/win32socketinit.cc" ]
     }
@@ -376,6 +378,8 @@ static_library("rtc_base") {
       "windowpicker.h",
     ]
 
+    deps += [ "..:webrtc_common" ]
+
     if (is_posix) {
       sources += [
         "latebindingsymboltable.cc",

webrtc/base/base.gyp

@@ -59,6 +59,7 @@
       'target_name': 'rtc_base',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         'rtc_base_approved',
       ],
       'defines': [

webrtc/common.gyp

@@ -12,6 +12,7 @@
       'target_name': 'webrtc_common',
       'type': 'static_library',
       'sources': [
+        'common_types.cc',
         'common_types.h',
         'config.h',
         'config.cc',

webrtc/common_audio/BUILD.gn

@@ -226,11 +226,5 @@ if (rtc_build_armv7_neon) {
         "-ffat-lto-objects",
       ]
     }
-
-    if (is_clang) {
-      # Suppress warnings from Chrome's Clang plugins.
-      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-      configs -= [ "//build/config/clang:find_bad_constructs" ]
-    }
   }
 }

webrtc/common_types.cc

@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/common_types.h"
+
+#include <string.h>
+
+namespace webrtc {
+
+int InStream::Rewind() { return -1; }
+
+int OutStream::Rewind() { return -1; }
+
+StreamDataCounters::StreamDataCounters() : first_packet_time_ms(-1) {}
+
+RTPHeader::RTPHeader()
+    : markerBit(false),
+      payloadType(0),
+      sequenceNumber(0),
+      timestamp(0),
+      ssrc(0),
+      numCSRCs(0),
+      paddingLength(0),
+      headerLength(0),
+      payload_type_frequency(0),
+      extension() {
+  memset(&arrOfCSRCs, 0, sizeof(arrOfCSRCs));
+}
+
+}  // namespace webrtc

webrtc/common_types.h

@@ -57,7 +57,7 @@ class InStream
 {
 public:
     virtual int Read(void *buf, size_t len) = 0;
-    virtual int Rewind() {return -1;}
+    virtual int Rewind();
     virtual ~InStream() {}
 protected:
     InStream() {}
@@ -67,7 +67,7 @@ class OutStream
 {
 public:
     virtual bool Write(const void *buf, size_t len) = 0;
-    virtual int Rewind() {return -1;}
+    virtual int Rewind();
     virtual ~OutStream() {}
 protected:
     OutStream() {}
@@ -809,19 +809,7 @@ struct RTPHeaderExtension {
 };
 
 struct RTPHeader {
-  RTPHeader()
+  RTPHeader();
-      : markerBit(false),
-        payloadType(0),
-        sequenceNumber(0),
-        timestamp(0),
-        ssrc(0),
-        numCSRCs(0),
-        paddingLength(0),
-        headerLength(0),
-        payload_type_frequency(0),
-        extension() {
-    memset(&arrOfCSRCs, 0, sizeof(arrOfCSRCs));
-  }
 
   bool markerBit;
   uint8_t payloadType;
@@ -870,7 +858,7 @@ struct RtpPacketCounter {
 
 // Data usage statistics for a (rtp) stream.
 struct StreamDataCounters {
-  StreamDataCounters() : first_packet_time_ms(-1) {}
+  StreamDataCounters();
 
   void Add(const StreamDataCounters& other) {
     transmitted.Add(other.transmitted);

webrtc/common_video/BUILD.gn

@@ -44,7 +44,10 @@ source_set("common_video") {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  deps = [ "../system_wrappers" ]
+  deps = [
+    "..:webrtc_common",
+    "../system_wrappers",
+  ]
 
   if (rtc_build_libyuv) {
     deps += [ "$rtc_libyuv_dir" ]

webrtc/common_video/common_video.gyp

@@ -18,6 +18,7 @@
         'libyuv/include',
       ],
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'direct_dependent_settings': {

webrtc/config.cc

@@ -29,6 +29,17 @@ std::string RtpExtension::ToString() const {
   return ss.str();
 }
 
+VideoStream::VideoStream()
+    : width(0),
+      height(0),
+      max_framerate(-1),
+      min_bitrate_bps(-1),
+      target_bitrate_bps(-1),
+      max_bitrate_bps(-1),
+      max_qp(-1) {}
+
+VideoStream::~VideoStream() = default;
+
 std::string VideoStream::ToString() const {
   std::stringstream ss;
   ss << "{width: " << width;
@@ -51,6 +62,13 @@ std::string VideoStream::ToString() const {
   return ss.str();
 }
 
+VideoEncoderConfig::VideoEncoderConfig()
+    : content_type(kRealtimeVideo),
+      encoder_specific_settings(NULL),
+      min_transmit_bitrate_bps(0) {}
+
+VideoEncoderConfig::~VideoEncoderConfig() = default;
+
 std::string VideoEncoderConfig::ToString() const {
   std::stringstream ss;
 

webrtc/config.h

@@ -56,14 +56,8 @@ struct RtpExtension {
 };
 
 struct VideoStream {
-  VideoStream()
+  VideoStream();
-      : width(0),
+  ~VideoStream();
-        height(0),
-        max_framerate(-1),
-        min_bitrate_bps(-1),
-        target_bitrate_bps(-1),
-        max_bitrate_bps(-1),
-        max_qp(-1) {}
   std::string ToString() const;
 
   size_t width;
@@ -95,11 +89,8 @@ struct VideoEncoderConfig {
     kScreenshare,
   };
 
-  VideoEncoderConfig()
+  VideoEncoderConfig();
-      : content_type(kRealtimeVideo),
+  ~VideoEncoderConfig();
-        encoder_specific_settings(NULL),
-        min_transmit_bitrate_bps(0) {}
-
   std::string ToString() const;
 
   std::vector<VideoStream> streams;

webrtc/libjingle/libjingle.gyp

@@ -31,6 +31,7 @@
       'dependencies': [
         '<(talk_root)/libjingle.gyp:libjingle_media',
         '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
       ],

webrtc/modules/audio_coding/BUILD.gn

@@ -72,6 +72,7 @@ source_set("audio_coding") {
     ":neteq",
     ":pcm16b",
     ":red",
+    "../..:webrtc_common",
     "../../common_audio",
     "../../system_wrappers",
   ]
@@ -89,6 +90,7 @@ source_set("audio_decoder_interface") {
   ]
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
+  deps = [ "../..:webrtc_common" ]
 }
 
 source_set("audio_encoder_interface") {
@@ -98,6 +100,7 @@ source_set("audio_encoder_interface") {
   ]
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
+  deps = [ "../..:webrtc_common" ]
 }
 
 config("cng_config") {
@@ -439,12 +442,6 @@ source_set("isac") {
     "codecs/isac/main/source/transform.c",
   ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   if (is_linux) {
     libs = [ "m" ]
   }
@@ -518,12 +515,6 @@ source_set("isacfix") {
     "codecs/isac/fix/source/transform_tables.c",
   ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   if (!is_win) {
     defines = [ "WEBRTC_LINUX" ]
   }
@@ -786,6 +777,7 @@ source_set("neteq") {
     ":isac",
     ":isacfix",
     ":pcm16b",
+    "../..:webrtc_common",
     "../../common_audio",
     "../../system_wrappers",
     rtc_opus_dir,

webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi

@@ -17,6 +17,7 @@
       'iSACFix',
       'PCM16B',
       'red',
+      '<(webrtc_root)/common.gyp:webrtc_common',
       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
     ],
@@ -37,6 +38,7 @@
       ],
       'dependencies': [
         '<@(audio_coding_dependencies)',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         'neteq',
       ],
       'include_dirs': [
@@ -122,6 +124,7 @@
           'dependencies': [
             'audio_coding_module',
             '<(DEPTH)/testing/gtest.gyp:gtest',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/test/test.gyp:test_support',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
@@ -140,6 +143,7 @@
           'dependencies': [
             'audio_coding_module',
             '<(DEPTH)/testing/gtest.gyp:gtest',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/test/test.gyp:test_support',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',

webrtc/modules/audio_coding/neteq/neteq.gypi

@@ -38,6 +38,7 @@
       'type': 'static_library',
       'dependencies': [
         '<@(neteq_dependencies)',
+        '<(webrtc_root)/common.gyp:webrtc_common',
       ],
       'defines': [
         '<@(neteq_defines)',

webrtc/modules/audio_coding/neteq/neteq_tests.gypi

@@ -234,6 +234,7 @@
         'iLBC',
         'iSAC',
         'CNG',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'direct_dependent_settings': {

webrtc/modules/audio_device/BUILD.gn

@@ -178,6 +178,7 @@ source_set("audio_device") {
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",

webrtc/modules/audio_device/audio_device.gypi

@@ -14,6 +14,7 @@
       'dependencies': [
         'webrtc_utility',
         '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],

webrtc/modules/audio_processing/BUILD.gn

@@ -126,7 +126,7 @@ source_set("audio_processing") {
   public_configs = [ "../..:common_inherited_config" ]
 
   defines = []
-  deps = []
+  deps = [ "../..:webrtc_common" ]
 
   if (aec_debug_dump) {
     defines += [ "WEBRTC_AEC_DEBUG_DUMP" ]

webrtc/modules/audio_processing/audio_processing.gypi

@@ -26,6 +26,7 @@
       },
       'dependencies': [
         '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
         '<(webrtc_root)/modules/modules.gyp:iSAC',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',

webrtc/modules/media_file/BUILD.gn

@@ -44,6 +44,7 @@ source_set("media_file") {
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../system_wrappers",
     "../../common_audio",
   ]

webrtc/modules/media_file/media_file.gypi

@@ -12,6 +12,7 @@
       'target_name': 'media_file',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
       ],

webrtc/modules/modules.gyp

@@ -79,6 +79,7 @@
             '<(DEPTH)/testing/gmock.gyp:gmock',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
             '<(webrtc_root)/modules/modules.gyp:video_capture',
             '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
@@ -361,6 +362,7 @@
           'type': '<(gtest_target_type)',
           'dependencies': [
             '<(DEPTH)/testing/gtest.gyp:gtest',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/common_video/common_video.gyp:common_video',
             '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
             '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',

webrtc/modules/remote_bitrate_estimator/BUILD.gn

@@ -18,6 +18,7 @@ source_set("remote_bitrate_estimator") {
 
   deps = [
     ":rbe_components",
+    "../..:webrtc_common",
     "../../system_wrappers",
   ]
 }
@@ -42,6 +43,7 @@ source_set("rbe_components") {
 
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
+  deps = [ "../..:webrtc_common" ]
 
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi

@@ -15,6 +15,7 @@
       'target_name': 'remote_bitrate_estimator',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [

webrtc/modules/rtp_rtcp/BUILD.gn

@@ -104,6 +104,7 @@ source_set("rtp_rtcp") {
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../system_wrappers",
     "../pacing",
     "../remote_bitrate_estimator",

webrtc/modules/utility/BUILD.gn

@@ -40,6 +40,7 @@ source_set("utility") {
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../common_audio",
     "../../system_wrappers",
     "../audio_coding",

webrtc/modules/video_capture/BUILD.gn

@@ -27,6 +27,7 @@ source_set("video_capture_module") {
   ]
 
   deps = [
+    "../..:webrtc_common",
     "../../common_video",
     "../../system_wrappers",
     "../utility",
@@ -87,6 +88,7 @@ if (!build_with_chromium) {
         "linux/video_capture_linux.cc",
         "linux/video_capture_linux.h",
       ]
+      deps += [ "../..:webrtc_common" ]
     }
     if (is_mac) {
       sources = [

webrtc/modules/video_capture/video_capture.gypi

@@ -17,6 +17,7 @@
       'type': 'static_library',
       'dependencies': [
         'webrtc_utility',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
@@ -55,6 +56,7 @@
           'type': 'static_library',
           'dependencies': [
             'video_capture_module',
+            '<(webrtc_root)/common.gyp:webrtc_common',
           ],
           'conditions': [
             ['OS=="linux"', {

webrtc/modules/video_coding/BUILD.gn

@@ -85,6 +85,7 @@ source_set("video_coding") {
     ":webrtc_i420",
     ":webrtc_vp8",
     ":webrtc_vp9",
+    "../..:webrtc_common",
     "../../common_video",
     "../../system_wrappers",
   ]
@@ -170,6 +171,7 @@ source_set("webrtc_vp8") {
 
   deps = [
     ":video_coding_utility",
+    "../..:webrtc_common",
     "../../common_video",
     "../../system_wrappers",
   ]

webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi

@@ -17,6 +17,7 @@
             'video_codecs_test_framework',
             'webrtc_video_coding',
             '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
             '<(webrtc_root)/test/metrics.gyp:metrics',
             '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',

webrtc/modules/video_coding/codecs/vp8/vp8.gyp

@@ -15,6 +15,7 @@
       'target_name': 'webrtc_vp8',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',

webrtc/modules/video_coding/video_coding_test.gypi

@@ -17,6 +17,7 @@
          'webrtc_utility',
          '<(DEPTH)/testing/gtest.gyp:gtest',
          '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+         '<(webrtc_root)/common.gyp:webrtc_common',
          '<(webrtc_root)/test/test.gyp:test_support',
          '<(webrtc_root)/test/metrics.gyp:metrics',
          '<(webrtc_root)/common_video/common_video.gyp:common_video',

webrtc/modules/video_render/BUILD.gn

@@ -23,6 +23,7 @@ source_set("video_render_module") {
   ]
 
   deps = [
+    "../..:webrtc_common",
     "../../common_video",
     "../../system_wrappers",
     "../utility",
@@ -87,6 +88,8 @@ if (!build_with_chromium) {
         "linux/video_x11_render.h",
       ]
 
+      deps += [ "../..:webrtc_common" ]
+
       libs += [ "Xext" ]
     }
     if (is_mac) {
@@ -160,6 +163,8 @@ if (!build_with_chromium) {
         "ios/video_render_ios_view.mm",
       ]
 
+      deps += [ "../..:webrtc_common" ]
+
       cflags += [ "-fobjc-arc" ]  # CLANG_ENABLE_OBJC_ARC = YES.
     }
 

webrtc/modules/video_render/video_render.gypi

@@ -17,6 +17,7 @@
       'type': 'static_library',
       'dependencies': [
         'webrtc_utility',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
@@ -56,6 +57,7 @@
           'target_name': 'video_render_module_internal_impl',
           'type': 'static_library',
           'dependencies': [
+            '<(webrtc_root)/common.gyp:webrtc_common',
             'video_render_module',
           ],
           'sources': [
@@ -163,6 +165,7 @@
           'dependencies': [
             'video_render_module_internal_impl',
             'webrtc_utility',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
             '<(webrtc_root)/common_video/common_video.gyp:common_video',
           ],

webrtc/p2p/p2p.gyp

@@ -14,6 +14,7 @@
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/common.gyp:webrtc_common',
       ],
       'cflags_cc!': [
         '-Wnon-virtual-dtor',

webrtc/system_wrappers/BUILD.gn

@@ -101,12 +101,6 @@ static_library("system_wrappers") {
 
   configs += [ "..:common_config" ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   public_configs = [
     "..:common_inherited_config",
   ]
@@ -119,7 +113,7 @@ static_library("system_wrappers") {
 
   defines = []
   libs = []
-  deps = []
+  deps = [ "..:webrtc_common" ]
 
   if (rtc_use_direct_trace) {
     defines += [ "WEBRTC_DIRECT_TRACE" ]
@@ -198,12 +192,6 @@ source_set("field_trial_default") {
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config" ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   deps = [
     ":system_wrappers",
   ]
@@ -217,12 +205,6 @@ source_set("metrics_default") {
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config" ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   deps = [
     ":system_wrappers",
   ]
@@ -233,12 +215,6 @@ source_set("system_wrappers_default") {
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config" ]
 
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
   deps = [
     ":field_trial_default",
     ":metrics_default",

webrtc/system_wrappers/system_wrappers.gyp

@@ -13,6 +13,7 @@
       'target_name': 'system_wrappers',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '../base/base.gyp:rtc_base_approved',
       ],
       'sources': [

webrtc/test/BUILD.gn

@@ -25,17 +25,12 @@ source_set("field_trial") {
   ]
 
   deps = [
+    "..:webrtc_common",
     "../system_wrappers",
   ]
 
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config"]
-
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
 }
 
 source_set("test_support") {
@@ -72,12 +67,6 @@ source_set("test_support") {
 
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config"]
-
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
 }
 
 source_set("test_support_main") {
@@ -100,10 +89,4 @@ source_set("test_support_main") {
 
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config"]
-
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
 }

webrtc/test/test.gyp

@@ -17,6 +17,7 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
@@ -64,6 +65,7 @@
         'rtp_file_writer.h',
       ],
       'dependencies': [
+        '<(DEPTH)/webrtc/common.gyp:webrtc_common',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
       ],
@@ -76,6 +78,7 @@
         'field_trial.h',
       ],
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
     },

webrtc/test/webrtc_test_common.gyp

@@ -57,6 +57,7 @@
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/modules/modules.gyp:media_file',
         '<(webrtc_root)/modules/modules.gyp:video_render',
         '<(webrtc_root)/test/test.gyp:frame_generator',

webrtc/video/BUILD.gn

@@ -34,6 +34,9 @@ source_set("video") {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  deps = [ "../video_engine:video_engine_core" ]
+  deps = [
+    "..:webrtc_common",
+    "../video_engine:video_engine_core",
+  ]
 }
 

webrtc/video_engine/BUILD.gn

@@ -109,6 +109,7 @@ source_set("video_engine_core") {
   }
 
   deps = [
+    "..:webrtc_common",
     "../common_video",
     "../modules/bitrate_controller",
     "../modules/rtp_rtcp",

webrtc/video_engine/test/auto_test/vie_auto_test.gypi

@@ -12,6 +12,7 @@
       'target_name': 'vie_auto_test',
       'type': 'executable',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
         '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',

webrtc/video_engine/test/libvietest/libvietest.gypi

@@ -11,6 +11,7 @@
       'target_name': 'libvietest',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(webrtc_root)/test/test.gyp:test_support',

webrtc/video_engine/video_engine_core.gypi

@@ -12,6 +12,7 @@
       'target_name': 'video_engine_core',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
 
         # common_video
        '<(webrtc_root)/common_video/common_video.gyp:common_video',

webrtc/voice_engine/BUILD.gn

@@ -96,6 +96,7 @@ source_set("voice_engine") {
   }
 
   deps = [
+    "..:webrtc_common",
     "../common_audio",
     "../modules/audio_coding",
     "../modules/audio_conference_mixer",

webrtc/voice_engine/voice_engine.gyp

@@ -15,6 +15,7 @@
       'target_name': 'voice_engine',
       'type': 'static_library',
       'dependencies': [
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
         '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
         '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',

webrtc/webrtc_examples.gyp

@@ -16,6 +16,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+            '<(webrtc_root)/common.gyp:webrtc_common',
             '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
             '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',

webrtc/webrtc_tests.gypi

@@ -146,6 +146,7 @@
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
         '<(webrtc_root)/modules/modules.gyp:video_capture',
         '<(webrtc_root)/modules/modules.gyp:video_render',