Moving/renaming webrtc/common.h.

webrtc/test/mock_voice_engine.h

Index: webrtc/test/mock_voice_engine.h
diff --git a/webrtc/test/mock_voice_engine.h b/webrtc/test/mock_voice_engine.h
index 469028dbf692cfb486573a706f929337dc4d8a5e..03c5d0f044f2ee553b8c918911eb683b03bfaf66 100644
--- a/webrtc/test/mock_voice_engine.h
+++ b/webrtc/test/mock_voice_engine.h
@@ -30,7 +30,7 @@ class MockVoiceEngine : public VoiceEngineImpl {
   // http://crbug.com/428099.
   MockVoiceEngine(
       rtc::scoped_refptr<AudioDecoderFactory> decoder_factory = nullptr)
-      : VoiceEngineImpl(new Config(), true),
+      : VoiceEngineImpl(),

[tommi, 2016/09/01 21:02:11]

necessary?

[the sun, 2016/09/02 07:02:46]

Done.

         decoder_factory_(decoder_factory) {
     // Increase ref count so this object isn't automatically deleted whenever
     // interfaces are Release():d.
@@ -123,7 +123,7 @@ class MockVoiceEngine : public VoiceEngineImpl {
   MOCK_METHOD0(audio_processing, AudioProcessing*());
   MOCK_METHOD0(Terminate, int());
   MOCK_METHOD0(CreateChannel, int());
-  MOCK_METHOD1(CreateChannel, int(const Config& config));
+  MOCK_METHOD1(CreateChannel, int(const AudioCodingModule::Config& acm_config));
   MOCK_METHOD1(DeleteChannel, int(int channel));
   MOCK_METHOD1(StartReceive, int(int channel));
   MOCK_METHOD1(StopReceive, int(int channel));