| Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc (revision 207505)
|
| +++ content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc (working copy)
|
| @@ -41,9 +41,8 @@
|
| public:
|
| MockMediaStreamDispatcherHost(base::MessageLoop* message_loop,
|
| MediaStreamManager* manager)
|
| - : MediaStreamDispatcherHost(kProcessId),
|
| - message_loop_(message_loop),
|
| - manager_(manager) {}
|
| + : MediaStreamDispatcherHost(kProcessId, manager),
|
| + message_loop_(message_loop) {}
|
|
|
| // A list of mock methods.
|
| MOCK_METHOD4(OnStreamGenerated,
|
| @@ -95,11 +94,6 @@
|
| return true;
|
| }
|
|
|
| - // Use our own MediaStreamManager.
|
| - virtual MediaStreamManager* GetManager() OVERRIDE {
|
| - return manager_;
|
| - }
|
| -
|
| // These handler methods do minimal things and delegate to the mock methods.
|
| void OnStreamGenerated(
|
| const IPC::Message& msg,
|
| @@ -123,7 +117,6 @@
|
| }
|
|
|
| base::MessageLoop* message_loop_;
|
| - MediaStreamManager* manager_;
|
| };
|
|
|
| class MockMediaStreamUIProxy : public FakeMediaStreamUIProxy {
|
|
|