| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "mojo/message_pump/message_pump_mojo.h" | 9 #include "mojo/message_pump/message_pump_mojo.h" |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 } // namespace | 21 } // namespace |
| 22 | 22 |
| 23 MockMediaRouteProvider::MockMediaRouteProvider() { | 23 MockMediaRouteProvider::MockMediaRouteProvider() { |
| 24 } | 24 } |
| 25 | 25 |
| 26 MockMediaRouteProvider::~MockMediaRouteProvider() { | 26 MockMediaRouteProvider::~MockMediaRouteProvider() { |
| 27 } | 27 } |
| 28 | 28 |
| 29 MediaRouterMojoTest::MediaRouterMojoTest() | 29 MediaRouterMojoTest::MediaRouterMojoTest() |
| 30 : extension_id_("ext-123"), | 30 : extension_id_("ext-123"), |
| 31 mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)), | 31 mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) { |
| 32 message_loop_(mojo::common::MessagePumpMojo::Create()) { | |
| 33 mock_media_router_->set_instance_id_for_test(kInstanceId); | 32 mock_media_router_->set_instance_id_for_test(kInstanceId); |
| 34 } | 33 } |
| 35 | 34 |
| 36 MediaRouterMojoTest::~MediaRouterMojoTest() { | 35 MediaRouterMojoTest::~MediaRouterMojoTest() { |
| 37 } | 36 } |
| 38 | 37 |
| 39 void MediaRouterMojoTest::ConnectProviderManagerService() { | 38 void MediaRouterMojoTest::ConnectProviderManagerService() { |
| 40 // Bind the |media_route_provider| interface to |media_route_provider_|. | 39 // Bind the |media_route_provider| interface to |media_route_provider_|. |
| 41 auto request = mojo::GetProxy(&media_router_proxy_); | 40 auto request = mojo::GetProxy(&media_router_proxy_); |
| 42 mock_media_router_->BindToMojoRequest(std::move(request), extension_id_); | 41 mock_media_router_->BindToMojoRequest(std::move(request), extension_id_); |
| 43 | 42 |
| 44 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to | 43 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to |
| 45 // |mock_media_route_provider_service_|. | 44 // |mock_media_route_provider_service_|. |
| 46 interfaces::MediaRouteProviderPtr mojo_media_router; | 45 interfaces::MediaRouteProviderPtr mojo_media_router; |
| 47 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>( | 46 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>( |
| 48 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); | 47 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); |
| 49 media_router_proxy_->RegisterMediaRouteProvider( | 48 media_router_proxy_->RegisterMediaRouteProvider( |
| 50 std::move(mojo_media_router), | 49 std::move(mojo_media_router), |
| 51 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>, | 50 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>, |
| 52 kInstanceId)); | 51 kInstanceId)); |
| 53 } | 52 } |
| 54 | 53 |
| 55 void MediaRouterMojoTest::SetUp() { | 54 void MediaRouterMojoTest::SetUp() { |
| 56 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id_)) | 55 ON_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id_)) |
| 57 .WillByDefault(testing::Return(false)); | 56 .WillByDefault(testing::Return(false)); |
| 58 ConnectProviderManagerService(); | 57 ConnectProviderManagerService(); |
| 59 message_loop_.RunUntilIdle(); | 58 base::RunLoop().RunUntilIdle(); |
| 60 } | 59 } |
| 61 | 60 |
| 62 void MediaRouterMojoTest::ProcessEventLoop() { | 61 void MediaRouterMojoTest::ProcessEventLoop() { |
| 63 message_loop_.RunUntilIdle(); | 62 base::RunLoop().RunUntilIdle(); |
| 64 } | 63 } |
| 65 | 64 |
| 66 } // namespace media_router | 65 } // namespace media_router |
| OLD | NEW |