chrome/test/media_router/media_router_integration_browsertest.cc - Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/media_router/media_router_integration_browsertest.cc

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved MRDC::GetOrCreateForWebContents to its own .cc file Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc ('K') | « chrome/test/media_router/media_router_e2e_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/media_router/media_router_integration_browsertest.cc

diff --git a/chrome/test/media_router/media_router_integration_browsertest.cc b/chrome/test/media_router/media_router_integration_browsertest.cc

index 9b7d26278e35e84eb28c46de9aead0b7047301fb..5139fe9919d0b8ff90a1faffd42ebe567ea232f4 100644

--- a/chrome/test/media_router/media_router_integration_browsertest.cc

+++ b/chrome/test/media_router/media_router_integration_browsertest.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"

+#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"

#include "chrome/test/base/ui_test_utils.h"

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/test_navigation_observer.h"

@@ -73,8 +73,8 @@ void MediaRouterIntegrationBrowserTest::OpenTestPage(

void MediaRouterIntegrationBrowserTest::ChooseSink(

content::WebContents* web_contents,

const std::string& sink_id) {

- MediaRouterDialogController* controller =

- MediaRouterDialogController::GetOrCreateForWebContents(web_contents);

+ MediaRouterDialogControllerImpl* controller =

+ MediaRouterDialogControllerImpl::GetOrCreateForWebContents(web_contents);

content::WebContents* dialog_contents = controller->GetMediaRouterDialog();

ASSERT_TRUE(dialog_contents);

std::string script = base::StringPrintf(