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

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

Issue 2859953002: Reland [Media Router] Custom Controls 3 - add plumbing through MRUI and MRWebUIMessageHandler (Closed)
Patch Set: Fix test failures Created 3 years, 7 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 27 matching lines...) Expand all
38 } 38 }
39 39
40 mojom::MediaControllerPtr MockMediaController::BindInterfacePtr() { 40 mojom::MediaControllerPtr MockMediaController::BindInterfacePtr() {
41 return binding_.CreateInterfacePtrAndBind(); 41 return binding_.CreateInterfacePtrAndBind();
42 } 42 }
43 43
44 void MockMediaController::CloseBinding() { 44 void MockMediaController::CloseBinding() {
45 binding_.Close(); 45 binding_.Close();
46 } 46 }
47 47
48 MockMediaRouteController::MockMediaRouteController(
49 const MediaRoute::Id& route_id,
50 mojom::MediaControllerPtr mojo_media_controller,
51 MediaRouter* media_router)
52 : MediaRouteController(route_id,
53 std::move(mojo_media_controller),
54 media_router) {}
55
56 MockMediaRouteController::~MockMediaRouteController() {}
57
48 MockMediaRouteControllerObserver::MockMediaRouteControllerObserver( 58 MockMediaRouteControllerObserver::MockMediaRouteControllerObserver(
49 scoped_refptr<MediaRouteController> controller) 59 scoped_refptr<MediaRouteController> controller)
50 : MediaRouteController::Observer(controller) {} 60 : MediaRouteController::Observer(controller) {}
51 61
52 MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {} 62 MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {}
53 63
54 MediaRouterMojoTest::MediaRouterMojoTest() 64 MediaRouterMojoTest::MediaRouterMojoTest()
55 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) { 65 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) {
56 mock_media_router_->Initialize(); 66 mock_media_router_->Initialize();
57 mock_media_router_->set_instance_id_for_test(kInstanceId); 67 mock_media_router_->set_instance_id_for_test(kInstanceId);
(...skipping 26 matching lines...) Expand all
84 94
85 void MediaRouterMojoTest::TearDown() { 95 void MediaRouterMojoTest::TearDown() {
86 mock_media_router_->Shutdown(); 96 mock_media_router_->Shutdown();
87 } 97 }
88 98
89 void MediaRouterMojoTest::ProcessEventLoop() { 99 void MediaRouterMojoTest::ProcessEventLoop() {
90 base::RunLoop().RunUntilIdle(); 100 base::RunLoop().RunUntilIdle();
91 } 101 }
92 102
93 } // 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/browser/ui/webui/media_router/media_router_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698