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

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

Issue 2589663003: mojo:: Rename mojo::GetProxy() to mojo::MakeRequest() (Closed)
Patch Set: Rebase Created 4 years 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 22 matching lines...) Expand all
33 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) { 33 : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) {
34 mock_media_router_->Initialize(); 34 mock_media_router_->Initialize();
35 mock_media_router_->set_instance_id_for_test(kInstanceId); 35 mock_media_router_->set_instance_id_for_test(kInstanceId);
36 extension_ = extensions::test_util::CreateEmptyExtension(); 36 extension_ = extensions::test_util::CreateEmptyExtension();
37 } 37 }
38 38
39 MediaRouterMojoTest::~MediaRouterMojoTest() {} 39 MediaRouterMojoTest::~MediaRouterMojoTest() {}
40 40
41 void MediaRouterMojoTest::ConnectProviderManagerService() { 41 void MediaRouterMojoTest::ConnectProviderManagerService() {
42 // Bind the |media_route_provider| interface to |media_route_provider_|. 42 // Bind the |media_route_provider| interface to |media_route_provider_|.
43 auto request = mojo::GetProxy(&media_router_proxy_); 43 auto request = mojo::MakeRequest(&media_router_proxy_);
44 mock_media_router_->BindToMojoRequest(std::move(request), *extension_); 44 mock_media_router_->BindToMojoRequest(std::move(request), *extension_);
45 45
46 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to 46 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to
47 // |mock_media_route_provider_service_|. 47 // |mock_media_route_provider_service_|.
48 mojom::MediaRouteProviderPtr mojo_media_router; 48 mojom::MediaRouteProviderPtr mojo_media_router;
49 binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>( 49 binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>(
50 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); 50 &mock_media_route_provider_, mojo::MakeRequest(&mojo_media_router)));
51 media_router_proxy_->RegisterMediaRouteProvider( 51 media_router_proxy_->RegisterMediaRouteProvider(
52 std::move(mojo_media_router), 52 std::move(mojo_media_router),
53 base::Bind(&ExpectEqualStrings, kInstanceId)); 53 base::Bind(&ExpectEqualStrings, kInstanceId));
54 } 54 }
55 55
56 void MediaRouterMojoTest::SetUp() { 56 void MediaRouterMojoTest::SetUp() {
57 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id())) 57 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id()))
58 .WillByDefault(testing::Return(false)); 58 .WillByDefault(testing::Return(false));
59 ConnectProviderManagerService(); 59 ConnectProviderManagerService();
60 base::RunLoop().RunUntilIdle(); 60 base::RunLoop().RunUntilIdle();
61 } 61 }
62 62
63 void MediaRouterMojoTest::TearDown() { 63 void MediaRouterMojoTest::TearDown() {
64 mock_media_router_->Shutdown(); 64 mock_media_router_->Shutdown();
65 } 65 }
66 66
67 void MediaRouterMojoTest::ProcessEventLoop() { 67 void MediaRouterMojoTest::ProcessEventLoop() {
68 base::RunLoop().RunUntilIdle(); 68 base::RunLoop().RunUntilIdle();
69 } 69 }
70 70
71 } // namespace media_router 71 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc ('k') | chrome/browser/process_resource_usage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698