webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc - Issue 2747863003: Loosening the coupling between WebRTC and //third_party/protobuf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2747863003: Loosening the coupling between WebRTC and //third_party/protobuf (Closed)

Patch Set: Rebasing Created 3 years, 9 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

« no previous file with comments | « webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc ('k') | webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ed96e1b9c689ec37793d9306cfeccd544de2b399..292f17f1746862582a93a448dafa4ccb0c3cb72f 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);