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

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
 
 namespace webrtc {
 
 class Clock;
 
 class ControllerManager {
  public:
   virtual ~ControllerManager() = default;
 
@@ skipping 13 matching lines @@
     ~Config();
     // Least time since last reordering for a new reordering to be made.
     int min_reordering_time_ms;
     // Least squared distance from last scoring point for a new reordering to be
     // made.
     float min_reordering_squared_distance;
     const Clock* clock;
   };
 
   static std::unique_ptr<ControllerManager> Create(
-      const ProtoString& config_string,
+      const std::string& config_string,
       size_t num_encoder_channels,
       rtc::ArrayView<const int> encoder_frame_lengths_ms,
       int min_encoder_bitrate_bps,
       size_t intial_channels_to_encode,
       int initial_frame_length_ms,
       int initial_bitrate_bps,
       bool initial_fec_enabled,
       bool initial_dtx_enabled,
       const Clock* clock);
 
@@ skipping 42 matching lines @@
   // |scoring_points_| saves the characteristic scoring points of various
   // controllers.
   std::map<const Controller*, ScoringPoint> controller_scoring_points_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ControllerManagerImpl);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_