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

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

Issue 1821823002: [Media Router] Conditionally enable mDNS on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Message loop to run loop Created 4 years, 9 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/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 "extensions/common/test_util.h" 9 #include "extensions/common/test_util.h"
10 #include "mojo/message_pump/message_pump_mojo.h" 10 #include "mojo/message_pump/message_pump_mojo.h"
(...skipping 11 matching lines...) Expand all
22 } // namespace 22 } // namespace
23 23
24 MockMediaRouteProvider::MockMediaRouteProvider() { 24 MockMediaRouteProvider::MockMediaRouteProvider() {
25 } 25 }
26 26
27 MockMediaRouteProvider::~MockMediaRouteProvider() { 27 MockMediaRouteProvider::~MockMediaRouteProvider() {
28 } 28 }
29 29
30 MediaRouterMojoTest::MediaRouterMojoTest() 30 MediaRouterMojoTest::MediaRouterMojoTest()
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()) { 32 run_loop_(new base::RunLoop()) {
33 mock_media_router_->set_instance_id_for_test(kInstanceId); 33 mock_media_router_->set_instance_id_for_test(kInstanceId);
34 extension_ = extensions::test_util::CreateEmptyExtension(); 34 extension_ = extensions::test_util::CreateEmptyExtension();
35 } 35 }
36 36
37 MediaRouterMojoTest::~MediaRouterMojoTest() { 37 MediaRouterMojoTest::~MediaRouterMojoTest() {
38 } 38 }
39 39
40 void MediaRouterMojoTest::ConnectProviderManagerService() { 40 void MediaRouterMojoTest::ConnectProviderManagerService() {
41 // Bind the |media_route_provider| interface to |media_route_provider_|. 41 // Bind the |media_route_provider| interface to |media_route_provider_|.
42 auto request = mojo::GetProxy(&media_router_proxy_); 42 auto request = mojo::GetProxy(&media_router_proxy_);
43 mock_media_router_->BindToMojoRequest(std::move(request), *extension_); 43 mock_media_router_->BindToMojoRequest(std::move(request), *extension_);
44 44
45 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to 45 // Bind the Mojo MediaRouter interface used by |mock_media_router_| to
46 // |mock_media_route_provider_service_|. 46 // |mock_media_route_provider_service_|.
47 interfaces::MediaRouteProviderPtr mojo_media_router; 47 interfaces::MediaRouteProviderPtr mojo_media_router;
48 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>( 48 binding_.reset(new mojo::Binding<interfaces::MediaRouteProvider>(
49 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router))); 49 &mock_media_route_provider_, mojo::GetProxy(&mojo_media_router)));
50 media_router_proxy_->RegisterMediaRouteProvider( 50 media_router_proxy_->RegisterMediaRouteProvider(
51 std::move(mojo_media_router), 51 std::move(mojo_media_router),
52 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>, 52 base::Bind(&ExpectAsyncResultEqual<std::string, mojo::String>,
53 kInstanceId)); 53 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 message_loop_.RunUntilIdle(); 60 run_loop_->RunUntilIdle();
61 run_loop_.reset(new base::RunLoop());
61 } 62 }
62 63
63 void MediaRouterMojoTest::ProcessEventLoop() { 64 void MediaRouterMojoTest::ProcessEventLoop() {
64 message_loop_.RunUntilIdle(); 65 run_loop_->RunUntilIdle();
66 run_loop_.reset(new base::RunLoop());
65 } 67 }
66 68
67 } // namespace media_router 69 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698