Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Unified Diff: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc

Issue 2791963003: Reland of Loosening the coupling between WebRTC and //third_party/protobuf (Closed)
Patch Set: Fixing webrtc/modules/audio_coding:builtin_audio_encoder_factory Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
index 4a2a57b29e5c3196aa313992903f491235746b22..6d1434a80fe06ce96b4d58d00ea812597b440587 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
@@ -11,6 +11,7 @@
#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"
@@ -273,7 +274,7 @@ constexpr int kInitialFrameLengthMs = 60;
constexpr int kMinBitrateBps = 6000;
ControllerManagerStates CreateControllerManager(
- const std::string& config_string) {
+ const ProtoString& config_string) {
ControllerManagerStates states;
states.simulated_clock.reset(new SimulatedClock(kClockInitialTime));
constexpr size_t kNumEncoderChannels = 2;
@@ -345,7 +346,7 @@ TEST(ControllerManagerTest, CreateFromConfigStringAndCheckDefaultOrder) {
AddFrameLengthControllerConfig(&config);
AddBitrateControllerConfig(&config);
- std::string config_string;
+ ProtoString config_string;
config.SerializeToString(&config_string);
auto states = CreateControllerManager(config_string);
@@ -376,7 +377,7 @@ TEST(ControllerManagerTest, CreateFromConfigStringAndCheckReordering) {
AddBitrateControllerConfig(&config);
- std::string config_string;
+ ProtoString config_string;
config.SerializeToString(&config_string);
auto states = CreateControllerManager(config_string);

Powered by Google App Engine
This is Rietveld 408576698