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

Side by Side 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 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 12 matching lines...) Expand all
23 23
24 MockMediaRouteProvider::MockMediaRouteProvider() {} 24 MockMediaRouteProvider::MockMediaRouteProvider() {}
25 25
26 MockMediaRouteProvider::~MockMediaRouteProvider() {} 26 MockMediaRouteProvider::~MockMediaRouteProvider() {}
27 27
28 MockEventPageTracker::MockEventPageTracker() {} 28 MockEventPageTracker::MockEventPageTracker() {}
29 29
30 MockEventPageTracker::~MockEventPageTracker() {} 30 MockEventPageTracker::~MockEventPageTracker() {}
31 31
32 MediaRouterMojoTest::MediaRouterMojoTest() 32 MediaRouterMojoTest::MediaRouterMojoTest()
33 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) { 33 : mock_media_router_(
34 new MediaRouterMojoImpl(nullptr, &mock_event_page_tracker_)) {
34 mock_media_router_->Initialize(); 35 mock_media_router_->Initialize();
35 mock_media_router_->set_instance_id_for_test(kInstanceId); 36 mock_media_router_->set_instance_id_for_test(kInstanceId);
36 extension_ = extensions::test_util::CreateEmptyExtension(); 37 extension_ = extensions::test_util::CreateEmptyExtension();
38 #if !defined(OS_ANDROID)
39 mock_media_router_->action_controller_.reset();
40 #endif
37 } 41 }
38 42
39 MediaRouterMojoTest::~MediaRouterMojoTest() {} 43 MediaRouterMojoTest::~MediaRouterMojoTest() {}
40 44
41 void MediaRouterMojoTest::ConnectProviderManagerService() { 45 void MediaRouterMojoTest::ConnectProviderManagerService() {
42 // Bind the |media_route_provider| interface to |media_route_provider_|. 46 // Bind the |media_route_provider| interface to |media_route_provider_|.
43 auto request = mojo::GetProxy(&media_router_proxy_); 47 auto request = mojo::GetProxy(&media_router_proxy_);
44 mock_media_router_->BindToMojoRequest(std::move(request), *extension_); 48 mock_media_router_->BindToMojoRequest(std::move(request), *extension_);
45 49
46 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to 50 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to
(...skipping 15 matching lines...) Expand all
62 66
63 void MediaRouterMojoTest::TearDown() { 67 void MediaRouterMojoTest::TearDown() {
64 mock_media_router_->Shutdown(); 68 mock_media_router_->Shutdown();
65 } 69 }
66 70
67 void MediaRouterMojoTest::ProcessEventLoop() { 71 void MediaRouterMojoTest::ProcessEventLoop() {
68 base::RunLoop().RunUntilIdle(); 72 base::RunLoop().RunUntilIdle();
69 } 73 }
70 74
71 } // namespace media_router 75 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698