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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1220 media_router_.reset(); | 1220 media_router_.reset(); |
1221 profile_.reset(); | 1221 profile_.reset(); |
1222 } | 1222 } |
1223 | 1223 |
1224 // Constructs bindings so that |media_router_| delegates calls to | 1224 // Constructs bindings so that |media_router_| delegates calls to |
1225 // |mojo_media_router_|, which are then handled by | 1225 // |mojo_media_router_|, which are then handled by |
1226 // |mock_media_route_provider_service_|. | 1226 // |mock_media_route_provider_service_|. |
1227 void BindMediaRouteProvider() { | 1227 void BindMediaRouteProvider() { |
1228 binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>( | 1228 binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>( |
1229 &mock_media_route_provider_, | 1229 &mock_media_route_provider_, |
1230 mojo::GetProxy(&media_route_provider_proxy_))); | 1230 mojo::MakeRequest(&media_route_provider_proxy_))); |
1231 media_router_->BindToMojoRequest(mojo::GetProxy(&media_router_proxy_), | 1231 media_router_->BindToMojoRequest(mojo::MakeRequest(&media_router_proxy_), |
1232 *extension_); | 1232 *extension_); |
1233 } | 1233 } |
1234 | 1234 |
1235 void ResetMediaRouteProvider() { | 1235 void ResetMediaRouteProvider() { |
1236 binding_.reset(); | 1236 binding_.reset(); |
1237 media_router_->BindToMojoRequest(mojo::GetProxy(&media_router_proxy_), | 1237 media_router_->BindToMojoRequest(mojo::MakeRequest(&media_router_proxy_), |
1238 *extension_); | 1238 *extension_); |
1239 } | 1239 } |
1240 | 1240 |
1241 void RegisterMediaRouteProvider() { | 1241 void RegisterMediaRouteProvider() { |
1242 media_router_proxy_->RegisterMediaRouteProvider( | 1242 media_router_proxy_->RegisterMediaRouteProvider( |
1243 std::move(media_route_provider_proxy_), | 1243 std::move(media_route_provider_proxy_), |
1244 base::Bind(&RegisterMediaRouteProviderHandler::Invoke, | 1244 base::Bind(&RegisterMediaRouteProviderHandler::Invoke, |
1245 base::Unretained(&provide_handler_))); | 1245 base::Unretained(&provide_handler_))); |
1246 } | 1246 } |
1247 | 1247 |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1560 EXPECT_CALL(mock_media_route_provider_, | 1560 EXPECT_CALL(mock_media_route_provider_, |
1561 UpdateMediaSinks(MediaSourceForDesktop().id())) | 1561 UpdateMediaSinks(MediaSourceForDesktop().id())) |
1562 .WillOnce(InvokeWithoutArgs([&run_loop2]() { | 1562 .WillOnce(InvokeWithoutArgs([&run_loop2]() { |
1563 run_loop2.Quit(); | 1563 run_loop2.Quit(); |
1564 })); | 1564 })); |
1565 | 1565 |
1566 run_loop2.Run(); | 1566 run_loop2.Run(); |
1567 } | 1567 } |
1568 | 1568 |
1569 } // namespace media_router | 1569 } // namespace media_router |
OLD | NEW |