Revert of Loosening the coupling between WebRTC and //third_party/protobuf

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc

 /*
  *  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.
  */
 
 #include <utility>
 
 #include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 
 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
 RTC_PUSH_IGNORING_WUNDEF()
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
 #else
@@ skipping 242 matching lines @@
 }
 
 constexpr int kInitialBitrateBps = 24000;
 constexpr size_t kIntialChannelsToEncode = 1;
 constexpr bool kInitialDtxEnabled = true;
 constexpr bool kInitialFecEnabled = true;
 constexpr int kInitialFrameLengthMs = 60;
 constexpr int kMinBitrateBps = 6000;
 
 ControllerManagerStates CreateControllerManager(
-    const ProtoString& config_string) {
+    const std::string& config_string) {
   ControllerManagerStates states;
   states.simulated_clock.reset(new SimulatedClock(kClockInitialTime));
   constexpr size_t kNumEncoderChannels = 2;
   const std::vector<int> encoder_frame_lengths_ms = {20, 60};
   states.controller_manager = ControllerManagerImpl::Create(
       config_string, kNumEncoderChannels, encoder_frame_lengths_ms,
       kMinBitrateBps, kIntialChannelsToEncode, kInitialFrameLengthMs,
       kInitialBitrateBps, kInitialFecEnabled, kInitialDtxEnabled,
       states.simulated_clock.get());
   return states;
@@ skipping 51 matching lines @@
   audio_network_adaptor::config::ControllerManager config;
   config.set_min_reordering_time_ms(kMinReorderingTimeMs);
   config.set_min_reordering_squared_distance(kMinReorderingSquareDistance);
 
   AddFecControllerConfig(&config);
   AddChannelControllerConfig(&config);
   AddDtxControllerConfig(&config);
   AddFrameLengthControllerConfig(&config);
   AddBitrateControllerConfig(&config);
 
-  ProtoString config_string;
+  std::string config_string;
   config.SerializeToString(&config_string);
 
   auto states = CreateControllerManager(config_string);
   Controller::NetworkMetrics metrics;
 
   auto controllers = states.controller_manager->GetSortedControllers(metrics);
   CheckControllersOrder(
       controllers,
       std::vector<ControllerType>{
           ControllerType::FEC, ControllerType::CHANNEL, ControllerType::DTX,
@@ skipping 10 matching lines @@
   // Internally associated with characteristic point 0.
   AddFecControllerConfig(&config);
 
   AddDtxControllerConfig(&config);
 
   // Internally associated with characteristic point 1.
   AddFrameLengthControllerConfig(&config);
 
   AddBitrateControllerConfig(&config);
 
-  ProtoString config_string;
+  std::string config_string;
   config.SerializeToString(&config_string);
 
   auto states = CreateControllerManager(config_string);
 
   Controller::NetworkMetrics metrics;
   metrics.uplink_bandwidth_bps =
       rtc::Optional<int>(kChracteristicBandwithBps[0]);
   metrics.uplink_packet_loss_fraction =
       rtc::Optional<float>(kChracteristicPacketLossFraction[0]);
 
@@ skipping 22 matching lines @@
   // Reorder now.
   CheckControllersOrder(controllers,
                         std::vector<ControllerType>{
                             ControllerType::FRAME_LENGTH, ControllerType::FEC,
                             ControllerType::CHANNEL, ControllerType::DTX,
                             ControllerType::BIT_RATE});
 }
 #endif  // WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
 
 }  // namespace webrtc