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

Unified Diff: chrome/browser/media/router/mojo/media_router_mojo_test.cc

Issue 2294973002: Create MediaRouterActionController and MediaRouterUIService (Closed)
Patch Set: Address Derek and Mark's comments Created 4 years, 3 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: chrome/browser/media/router/mojo/media_router_mojo_test.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_test.cc b/chrome/browser/media/router/mojo/media_router_mojo_test.cc
index 6b9bb1287917f546ea97cefdab1d17c8cbf9735f..f62a780c5ecfdd875b0841b520fe2eaeec5d48ab 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_test.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_test.cc
@@ -30,10 +30,14 @@ MockEventPageTracker::MockEventPageTracker() {}
MockEventPageTracker::~MockEventPageTracker() {}
MediaRouterMojoTest::MediaRouterMojoTest()
- : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) {
+ : mock_media_router_(
+ new MediaRouterMojoImpl(nullptr, &mock_event_page_tracker_)) {
mock_media_router_->Initialize();
mock_media_router_->set_instance_id_for_test(kInstanceId);
extension_ = extensions::test_util::CreateEmptyExtension();
+#if !defined(OS_ANDROID)
+ mock_media_router_->action_controller_.reset();
+#endif
}
MediaRouterMojoTest::~MediaRouterMojoTest() {}

Powered by Google App Engine
This is Rietveld 408576698