Adding BitrateController to audio network adaptor.

webrtc/modules/BUILD.gn

Index: webrtc/modules/BUILD.gn
diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index d9b92a7a69d535515b216780d406a33f37c6f182..280a22bbd629a92eb07d51b4d01c04f1b9bf7d98 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -236,6 +236,26 @@ if (rtc_include_tests) {
     }
   }
 
+  rtc_source_set("audio_network_adaptor_unittests") {

[hlundin-webrtc, 2016/09/15 11:01:09]

What is the benefit of breaking this out of the modules_unittests?

[minyue-webrtc, 2016/09/15 12:12:15]

the title of patch set 2 mentioned this. To be clearer, this is because
bitrate_controller_unittest.cc exists in modules/bitrate_controller but GN does
not allow this type of collision. GN's suggestion is to put it in a  separate
source set, according to the error message:
"
... either rename one of the files or move one of
the sources to a separate source_set to avoid them both being in
the same target.
"
A separate source_set also looks nicer.

[hlundin-webrtc, 2016/09/19 11:08:57]

Oh, I see. Good. Can you just add a comment explaining this in the gn file?

+    testonly = true
+    sources = [
+      "audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc",
+      "audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc",
+      "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
+      "audio_coding/audio_network_adaptor/mock/mock_controller.h",
+      "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
+    ]
+    deps = [
+      "audio_coding:audio_network_adaptor",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+    if (is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+
   rtc_test("modules_unittests") {
     testonly = true
 
@@ -248,10 +268,6 @@ if (rtc_include_tests) {
       "audio_coding/acm2/codec_manager_unittest.cc",
       "audio_coding/acm2/initial_delay_manager_unittest.cc",
       "audio_coding/acm2/rent_a_codec_unittest.cc",
-      "audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc",
-      "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
-      "audio_coding/audio_network_adaptor/mock/mock_controller.h",
-      "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
       "audio_coding/codecs/audio_decoder_factory_unittest.cc",
       "audio_coding/codecs/cng/audio_encoder_cng_unittest.cc",
       "audio_coding/codecs/cng/cng_unittest.cc",
@@ -587,6 +603,7 @@ if (rtc_include_tests) {
     }
 
     deps += [
+      ":audio_network_adaptor_unittests",
       "..:webrtc_common",
       "../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
       "../common_audio",
@@ -600,7 +617,6 @@ if (rtc_include_tests) {
       "audio_coding",
       "audio_coding:acm_receive_test",
       "audio_coding:acm_send_test",
-      "audio_coding:audio_network_adaptor",
       "audio_coding:builtin_audio_decoder_factory",
       "audio_coding:cng",
       "audio_coding:isac_fix",