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

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Issue 13989003: Replace MediaStreamUIController with MediaStreamUIProxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index 799d15c5a0d88e7962678b4ec2ad53054ad821b0..21b45df326934910eb00fc69deb8aa518e7453d8 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -9,6 +9,7 @@
#include "content/browser/browser_thread_impl.h"
#include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
+#include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/media/media_stream_messages.h"
#include "content/common/media/media_stream_options.h"
@@ -125,7 +126,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost,
MediaStreamManager* manager_;
};
-class MockMediaStreamUI : public MediaStreamUI {
+class MockMediaStreamUIProxy : public FakeMediaStreamUIProxy {
public:
MOCK_METHOD1(OnStarted, void(const base::Closure& stop));
};
@@ -164,11 +165,11 @@ class MediaStreamDispatcherHostTest : public testing::Test {
}
virtual void SetupFakeUI(bool expect_started) {
- scoped_ptr<MockMediaStreamUI> stream_ui(new MockMediaStreamUI());
+ scoped_ptr<MockMediaStreamUIProxy> stream_ui(new MockMediaStreamUIProxy());
if (expect_started) {
EXPECT_CALL(*stream_ui, OnStarted(_));
}
- media_stream_manager_->UseFakeUI(stream_ui.PassAs<MediaStreamUI>());
+ media_stream_manager_->UseFakeUI(stream_ui.PassAs<MediaStreamUIProxy>());
}
virtual void TearDown() OVERRIDE {
@@ -333,10 +334,10 @@ TEST_F(MediaStreamDispatcherHostTest, CloseFromUI) {
StreamOptions options(MEDIA_NO_SERVICE, MEDIA_DEVICE_VIDEO_CAPTURE);
base::Closure close_callback;
- scoped_ptr<MockMediaStreamUI> stream_ui(new MockMediaStreamUI());
+ scoped_ptr<MockMediaStreamUIProxy> stream_ui(new MockMediaStreamUIProxy());
EXPECT_CALL(*stream_ui, OnStarted(_))
.WillOnce(SaveArg<0>(&close_callback));
- media_stream_manager_->UseFakeUI(stream_ui.PassAs<MediaStreamUI>());
+ media_stream_manager_->UseFakeUI(stream_ui.PassAs<MediaStreamUIProxy>());
EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
EXPECT_CALL(*host_, OnStreamGenerationFailed(kRenderId, kPageRequestId));

Powered by Google App Engine
This is Rietveld 408576698