| OLD | NEW |
| 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/media_router_mojo_test.h" | 5 #include "chrome/browser/media/router/media_router_mojo_test.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "mojo/message_pump/message_pump_mojo.h" | 9 #include "mojo/message_pump/message_pump_mojo.h" |
| 8 | 10 |
| 9 namespace media_router { | 11 namespace media_router { |
| 10 namespace { | 12 namespace { |
| 11 | 13 |
| 12 const char kInstanceId[] = "instance123"; | 14 const char kInstanceId[] = "instance123"; |
| 13 | 15 |
| 14 template <typename T1, typename T2> | 16 template <typename T1, typename T2> |
| 15 void ExpectAsyncResultEqual(T1 expected, T2 actual) { | 17 void ExpectAsyncResultEqual(T1 expected, T2 actual) { |
| 16 EXPECT_EQ(expected, actual); | 18 EXPECT_EQ(expected, actual); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 30 message_loop_(mojo::common::MessagePumpMojo::Create()) { | 32 message_loop_(mojo::common::MessagePumpMojo::Create()) { |
| 31 mock_media_router_->set_instance_id_for_test(kInstanceId); | 33 mock_media_router_->set_instance_id_for_test(kInstanceId); |
| 32 } | 34 } |
| 33 | 35 |
| 34 MediaRouterMojoTest::~MediaRouterMojoTest() { | 36 MediaRouterMojoTest::~MediaRouterMojoTest() { |
| 35 } | 37 } |
| 36 | 38 |
| 37 void MediaRouterMojoTest::ConnectProviderManagerService() { | 39 void MediaRouterMojoTest::ConnectProviderManagerService() { |
| 38 // Bind the |media_route_provider| interface to |media_route_provider_|. | 40 // Bind the |media_route_provider| interface to |media_route_provider_|. |
| 39 auto request = mojo::GetProxy(&media_router_proxy_); | 41 auto request = mojo::GetProxy(&media_router_proxy_); |
| 40 mock_media_router_->BindToMojoRequest(request.Pass(), extension_id_); | 42 mock_media_router_->BindToMojoRequest(std::move(request), extension_id_); |
| 41 | 43 |
| 42 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to | 44 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to |
| 43 // |mock_media_route_provider_service_|. | 45 // |mock_media_route_provider_service_|. |
| 44 interfaces::MediaRouteProviderPtr mojo_media_router; | 46 interfaces::MediaRouteProviderPtr mojo_media_router; |
| 45 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>( | 47 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>( |
| 46 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); | 48 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); |
| 47 media_router_proxy_->RegisterMediaRouteProvider( | 49 media_router_proxy_->RegisterMediaRouteProvider( |
| 48 mojo_media_router.Pass(), | 50 std::move(mojo_media_router), |
| 49 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>, | 51 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>, |
| 50 kInstanceId)); | 52 kInstanceId)); |
| 51 } | 53 } |
| 52 | 54 |
| 53 void MediaRouterMojoTest::SetUp() { | 55 void MediaRouterMojoTest::SetUp() { |
| 54 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id_)) | 56 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id_)) |
| 55 .WillByDefault(testing::Return(false)); | 57 .WillByDefault(testing::Return(false)); |
| 56 ConnectProviderManagerService(); | 58 ConnectProviderManagerService(); |
| 57 message_loop_.RunUntilIdle(); | 59 message_loop_.RunUntilIdle(); |
| 58 } | 60 } |
| 59 | 61 |
| 60 void MediaRouterMojoTest::ProcessEventLoop() { | 62 void MediaRouterMojoTest::ProcessEventLoop() { |
| 61 message_loop_.RunUntilIdle(); | 63 message_loop_.RunUntilIdle(); |
| 62 } | 64 } |
| 63 | 65 |
| 64 } // namespace media_router | 66 } // namespace media_router |
| OLD | NEW |