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

Side by Side Diff: chrome/browser/media/router/mojo/media_router_mojo_test.cc

Issue 2837363002: [Media Router] Use DialMediaSinkService in MediaRouterMojoImpl (Closed)
Patch Set: resolve code review comments from Derek Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/router/mojo/media_router_mojo_test.h" 5 #include "chrome/browser/media/router/mojo/media_router_mojo_test.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "extensions/common/test_util.h" 10 #include "extensions/common/test_util.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 MockMediaRouteController::~MockMediaRouteController() {} 53 MockMediaRouteController::~MockMediaRouteController() {}
54 54
55 MockMediaRouteControllerObserver::MockMediaRouteControllerObserver( 55 MockMediaRouteControllerObserver::MockMediaRouteControllerObserver(
56 scoped_refptr<MediaRouteController> controller) 56 scoped_refptr<MediaRouteController> controller)
57 : MediaRouteController::Observer(controller) {} 57 : MediaRouteController::Observer(controller) {}
58 58
59 MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {} 59 MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {}
60 60
61 MediaRouterMojoTest::MediaRouterMojoTest() 61 MediaRouterMojoTest::MediaRouterMojoTest()
62 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) { 62 : mock_media_router_(
63 new MediaRouterMojoImpl(&mock_event_page_tracker_, &profile_)) {
63 mock_media_router_->Initialize(); 64 mock_media_router_->Initialize();
64 mock_media_router_->set_instance_id_for_test(kInstanceId); 65 mock_media_router_->set_instance_id_for_test(kInstanceId);
65 extension_ = extensions::test_util::CreateEmptyExtension(); 66 extension_ = extensions::test_util::CreateEmptyExtension();
66 } 67 }
67 68
68 MediaRouterMojoTest::~MediaRouterMojoTest() {} 69 MediaRouterMojoTest::~MediaRouterMojoTest() {}
69 70
70 void MediaRouterMojoTest::ConnectProviderManagerService() { 71 void MediaRouterMojoTest::ConnectProviderManagerService() {
71 // Bind the |media_route_provider| interface to |media_route_provider_|. 72 // Bind the |media_route_provider| interface to |media_route_provider_|.
72 auto request = mojo::MakeRequest(&media_router_proxy_); 73 auto request = mojo::MakeRequest(&media_router_proxy_);
(...skipping 20 matching lines...) Expand all
93 94
94 void MediaRouterMojoTest::TearDown() { 95 void MediaRouterMojoTest::TearDown() {
95 mock_media_router_->Shutdown(); 96 mock_media_router_->Shutdown();
96 } 97 }
97 98
98 void MediaRouterMojoTest::ProcessEventLoop() { 99 void MediaRouterMojoTest::ProcessEventLoop() {
99 base::RunLoop().RunUntilIdle(); 100 base::RunLoop().RunUntilIdle();
100 } 101 }
101 102
102 } // namespace media_router 103 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/mojo/media_router_mojo_test.h ('k') | chrome/common/media_router/discovery/media_sink_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698