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

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

Issue 2949933002: [Media Router] Factor extension-related logic out of MediaRouterMojoImpl (Closed)
Patch Set: Remove includes Created 3 years, 5 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 | « chrome/browser/media/router/mojo/media_router_mojo_test.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 be41039e1ce25584cfa2481c4d4a20c9f854d550..357e7ed4aa95cc629f5c6fab787332f9d672c047 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_test.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_test.cc
@@ -60,13 +60,7 @@ MockMediaRouteControllerObserver::MockMediaRouteControllerObserver(
MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {}
-MediaRouterMojoTest::MediaRouterMojoTest()
- : mock_media_router_(
- new MediaRouterMojoImpl(&mock_event_page_tracker_, &profile_)) {
- mock_media_router_->Initialize();
- mock_media_router_->set_instance_id_for_test(kInstanceId);
- extension_ = extensions::test_util::CreateEmptyExtension();
-}
+MediaRouterMojoTest::MediaRouterMojoTest() {}
MediaRouterMojoTest::~MediaRouterMojoTest() {}
@@ -78,8 +72,8 @@ void MediaRouterMojoTest::ConnectProviderManagerService() {
// Bind the Mojo MediaRouter interface used by |mock_media_router_| to
// |mock_media_route_provider_service_|.
mojom::MediaRouteProviderPtr mojo_media_router;
- binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>(
- &mock_media_route_provider_, mojo::MakeRequest(&mojo_media_router)));
+ binding_ = base::MakeUnique<mojo::Binding<mojom::MediaRouteProvider>>(
+ &mock_media_route_provider_, mojo::MakeRequest(&mojo_media_router));
EXPECT_CALL(provide_handler_, InvokeInternal(kInstanceId, testing::_));
media_router_proxy_->RegisterMediaRouteProvider(
std::move(mojo_media_router),
@@ -88,8 +82,10 @@ void MediaRouterMojoTest::ConnectProviderManagerService() {
}
void MediaRouterMojoTest::SetUp() {
- ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id()))
- .WillByDefault(testing::Return(false));
+ mock_media_router_.reset(new MediaRouterMojoImpl(&profile_));
+ mock_media_router_->Initialize();
+ mock_media_router_->set_instance_id_for_test(kInstanceId);
+ extension_ = extensions::test_util::CreateEmptyExtension();
ConnectProviderManagerService();
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « chrome/browser/media/router/mojo/media_router_mojo_test.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698