| Index: chrome/browser/media/router/mojo/media_router_mojo_test.cc
|
| diff --git a/chrome/browser/media/router/mojo/media_router_mojo_test.cc b/chrome/browser/media/router/mojo/media_router_mojo_test.cc
|
| index d88c9649ee66492920e2f9a33701084de4617d1c..09ad5b3a60f4ef9cd3c8ac0a060528814daf801c 100644
|
| --- a/chrome/browser/media/router/mojo/media_router_mojo_test.cc
|
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_test.cc
|
| @@ -11,14 +11,7 @@
|
|
|
| namespace media_router {
|
| namespace {
|
| -
|
| const char kInstanceId[] = "instance123";
|
| -
|
| -void ExpectEqualStrings(const std::string& expected,
|
| - const std::string& actual) {
|
| - EXPECT_EQ(expected, actual);
|
| -}
|
| -
|
| } // namespace
|
|
|
| MockMediaRouteProvider::MockMediaRouteProvider() {}
|
| @@ -33,6 +26,9 @@ MockMediaController::MockMediaController() : binding_(this) {}
|
|
|
| MockMediaController::~MockMediaController() {}
|
|
|
| +RegisterMediaRouteProviderHandler::RegisterMediaRouteProviderHandler() {}
|
| +RegisterMediaRouteProviderHandler::~RegisterMediaRouteProviderHandler() {}
|
| +
|
| void MockMediaController::Bind(mojom::MediaControllerRequest request) {
|
| binding_.Bind(std::move(request));
|
| }
|
| @@ -52,7 +48,9 @@ MockMediaRouteControllerObserver::MockMediaRouteControllerObserver(
|
| MockMediaRouteControllerObserver::~MockMediaRouteControllerObserver() {}
|
|
|
| MediaRouterMojoTest::MediaRouterMojoTest()
|
| - : mock_media_router_(new MediaRouterMojoImpl(&mock_event_page_tracker_)) {
|
| + : profile_(new TestingProfile()),
|
| + mock_media_router_(
|
| + new MediaRouterMojoImpl(&mock_event_page_tracker_, profile_.get())) {
|
| mock_media_router_->Initialize();
|
| mock_media_router_->set_instance_id_for_test(kInstanceId);
|
| extension_ = extensions::test_util::CreateEmptyExtension();
|
| @@ -70,9 +68,11 @@ void MediaRouterMojoTest::ConnectProviderManagerService() {
|
| mojom::MediaRouteProviderPtr mojo_media_router;
|
| binding_.reset(new mojo::Binding<mojom::MediaRouteProvider>(
|
| &mock_media_route_provider_, mojo::MakeRequest(&mojo_media_router)));
|
| + EXPECT_CALL(provide_handler_, InvokeRaw(kInstanceId, testing::_));
|
| media_router_proxy_->RegisterMediaRouteProvider(
|
| std::move(mojo_media_router),
|
| - base::Bind(&ExpectEqualStrings, kInstanceId));
|
| + base::Bind(&RegisterMediaRouteProviderHandler::Invoke,
|
| + base::Unretained(&provide_handler_)));
|
| }
|
|
|
| void MediaRouterMojoTest::SetUp() {
|
|
|