chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_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/browser/ui/webui/media_router/media_router_dialog_controller_impl_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: Fixed test_support compile issue on ChromeOS 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/media/router/media_router.h ('K') | « chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc

diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_browsertest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc

similarity index 95%

rename from chrome/browser/ui/webui/media_router/media_router_dialog_controller_browsertest.cc

rename to chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc

index 1761cf939dd5cbbbf7b12be1de7ae4af5bb1061c..18733d1f6a27e9edd8c521189edcb15c467a8966 100644

--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_browsertest.cc

+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc

@@ -6,7 +6,7 @@

#include "chrome/browser/ui/browser_commands.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/browser/ui/webui/media_router/media_router_ui.h"

#include "chrome/common/chrome_switches.h"

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

@@ -39,9 +39,9 @@ class MediaRouterDialogControllerBrowserTest : public InProcessBrowserTest {

initiator_ = browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(initiator_);

- MediaRouterDialogController::CreateForWebContents(initiator_);

+ MediaRouterDialogControllerImpl::CreateForWebContents(initiator_);

dialog_controller_ =

- MediaRouterDialogController::FromWebContents(initiator_);

+ MediaRouterDialogControllerImpl::FromWebContents(initiator_);

ASSERT_TRUE(dialog_controller_);

// Get the media router dialog for the initiator.

@@ -49,7 +49,7 @@ class MediaRouterDialogControllerBrowserTest : public InProcessBrowserTest {

ASSERT_TRUE(media_router_dialog_);

}

- MediaRouterDialogController* dialog_controller_;

+ MediaRouterDialogControllerImpl* dialog_controller_;

WebContents* initiator_;

WebContents* media_router_dialog_;