| Index: chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| diff --git a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| index 85b65c41cefd0df6bc7a67595c6b672915c04ba4..d4543441792de518df4871e07f4a0209dce89d5a 100644
|
| --- a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| +++ b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| @@ -5,7 +5,6 @@
|
| #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
|
|
|
| #include "base/memory/ptr_util.h"
|
| -#include "base/test/mock_callback.h"
|
| #include "chrome/browser/media/router/media_source.h"
|
| #include "chrome/browser/media/router/media_source_helper.h"
|
| #include "chrome/browser/media/router/mock_media_router.h"
|
| @@ -486,7 +485,7 @@
|
| main_frame_process_id_, main_frame_routing_id_, &listener1_));
|
| }
|
|
|
| -TEST_F(PresentationServiceDelegateImplTest, ConnectToPresentation) {
|
| +TEST_F(PresentationServiceDelegateImplTest, ConnectToOffscreenPresentation) {
|
| content::RenderFrameHost* main_frame = GetWebContents()->GetMainFrame();
|
| ASSERT_TRUE(main_frame);
|
| int render_process_id = main_frame->GetProcess()->GetID();
|
| @@ -495,18 +494,6 @@
|
| GURL presentation_url = GURL("http://www.example.com/presentation.html");
|
| content::PresentationSessionInfo session_info(presentation_url,
|
| presentation_id);
|
| -
|
| - base::MockCallback<
|
| - base::Callback<void(const content::PresentationSessionInfo&)>>
|
| - mock_callback;
|
| - EXPECT_CALL(mock_callback, Run(_));
|
| - MediaRoute media_route(
|
| - "route_id", MediaSourceForPresentationUrl(session_info.presentation_url),
|
| - "mediaSinkId", "", true, "", true);
|
| - media_route.set_offscreen_presentation(true);
|
| - delegate_impl_->OnStartSessionSucceeded(render_process_id, render_frame_id,
|
| - mock_callback.Get(), session_info,
|
| - media_route);
|
|
|
| OffscreenPresentationManagerFactory::GetInstanceForTest()->SetTestingFactory(
|
| profile(), &BuildMockOffscreenPresentationManager);
|
| @@ -521,16 +508,9 @@
|
|
|
| content::PresentationConnectionPtr connection_ptr;
|
| content::PresentationConnectionRequest connection_request;
|
| - delegate_impl_->ConnectToPresentation(render_process_id, render_frame_id,
|
| - session_info, std::move(connection_ptr),
|
| - std::move(connection_request));
|
| -
|
| - EXPECT_CALL(*mock_offscreen_manager,
|
| - UnregisterOffscreenPresentationController(
|
| - presentation_id,
|
| - RenderFrameHostId(render_process_id, render_frame_id)));
|
| - EXPECT_CALL(router_, DetachRoute("route_id"));
|
| - delegate_impl_->Reset(render_process_id, render_frame_id);
|
| + delegate_impl_->ConnectToOffscreenPresentation(
|
| + render_process_id, render_frame_id, session_info,
|
| + std::move(connection_ptr), std::move(connection_request));
|
| }
|
|
|
| #if !defined(OS_ANDROID)
|
|
|