Relanding of "Adding BitrateController to audio network adaptor."

webrtc/modules/BUILD.gn

 # Copyright (c) 2016 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.
 
 import("../build/webrtc.gni")
 import("audio_coding/audio_coding.gni")
@@ skipping 215 matching lines @@
   if (is_ios) {
     bundle_data("modules_unittests_bundle_data") {
       testonly = true
       sources = modules_unittests_resources
       outputs = [
         "{{bundle_resources_dir}}/{{source_file_part}}",
       ]
     }
   }
 
+  rtc_source_set("audio_network_adaptor_unittests") {
+    # Put sources for unittests of audio network adaptor in a separate
+    # rtc_source_set to solve name collision on bitrate_controller_unittest.cc.
+    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/channel_controller_unittest.cc",
+      "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
+      "audio_coding/audio_network_adaptor/dtx_controller_unittest.cc",
+      "audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc",
+      "audio_coding/audio_network_adaptor/mock/mock_controller.h",
+      "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
+      "audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc",
+    ]
+    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
 
     defines = audio_coding_defines
     deps = []
     sources = [
       "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
       "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
       "audio_coding/acm2/call_statistics_unittest.cc",
       "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/channel_controller_unittest.cc",
-      "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
-      "audio_coding/audio_network_adaptor/dtx_controller_unittest.cc",
-      "audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc",
-      "audio_coding/audio_network_adaptor/mock/mock_controller.h",
-      "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
-      "audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc",
       "audio_coding/codecs/audio_decoder_factory_unittest.cc",
       "audio_coding/codecs/cng/audio_encoder_cng_unittest.cc",
       "audio_coding/codecs/cng/cng_unittest.cc",
       "audio_coding/codecs/ilbc/ilbc_unittest.cc",
       "audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc",
       "audio_coding/codecs/isac/fix/source/filters_unittest.cc",
       "audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc",
       "audio_coding/codecs/isac/fix/source/transform_unittest.cc",
       "audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc",
       "audio_coding/codecs/isac/main/source/isac_unittest.cc",
@@ skipping 324 matching lines @@
     }
 
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
         "/wd4373",  # virtual function override.
       ]
     }
 
     deps += [
+      ":audio_network_adaptor_unittests",
       "..:webrtc_common",
       "../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
       "../common_audio",
       "../common_video",
       "../system_wrappers:system_wrappers",
       "../test:rtp_test_utils",
       "../test:test_common",
       "../test:test_support_main",
       "../test:test_support_main",
       "../test:video_test_common",
       "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",
       "audio_coding:neteq",
       "audio_coding:neteq_test_support",
       "audio_coding:neteq_unittest_tools",
       "audio_coding:pcm16b",
       "audio_coding:red",
       "audio_coding:webrtc_opus",
       "audio_conference_mixer",
@@ skipping 50 matching lines @@
       sources += [
         "audio_device/ios/audio_device_unittest_ios.cc",
         "audio_device/ios/objc/RTCAudioSessionTest.mm",
         "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc",
       ]
 
       ldflags = [ "-ObjC" ]
     }
   }
 }