diff options
| author | avayvod <avayvod@chromium.org> | 2015-07-21 11:44:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-21 18:45:24 +0000 |
| commit | 6f828083bd41d61e23a6ebe89288a9b3126ae586 (patch) | |
| tree | 81f72c5652408856eab9cffc972d4d0d017faf2a /chrome/test/media_router | |
| parent | 98e52c65f19c80867ba2b15b12c80e4ded8d950c (diff) | |
| download | chromium_src-6f828083bd41d61e23a6ebe89288a9b3126ae586.zip chromium_src-6f828083bd41d61e23a6ebe89288a9b3126ae586.tar.gz chromium_src-6f828083bd41d61e23a6ebe89288a9b3126ae586.tar.bz2 | |
[MediaRouter] The minimal change to make everything build on Android.
BUG=412331
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/1228863005
Cr-Commit-Position: refs/heads/master@{#339708}
Diffstat (limited to 'chrome/test/media_router')
| -rw-r--r-- | chrome/test/media_router/media_router_e2e_browsertest.cc | 4 | ||||
| -rw-r--r-- | chrome/test/media_router/media_router_integration_browsertest.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/media_router/media_router_e2e_browsertest.cc b/chrome/test/media_router/media_router_e2e_browsertest.cc index a146e685..93ee592 100644 --- a/chrome/test/media_router/media_router_e2e_browsertest.cc +++ b/chrome/test/media_router/media_router_e2e_browsertest.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/stl_util.h" #include "chrome/browser/media/router/media_router.h" +#include "chrome/browser/media/router/media_router_factory.h" #include "chrome/browser/media/router/media_router_mojo_impl.h" -#include "chrome/browser/media/router/media_router_mojo_impl_factory.h" #include "chrome/browser/media/router/media_source.h" #include "chrome/browser/media/router/media_source_helper.h" #include "chrome/browser/profiles/profile.h" @@ -53,7 +53,7 @@ MediaRouterE2EBrowserTest::~MediaRouterE2EBrowserTest() { void MediaRouterE2EBrowserTest::SetUpOnMainThread() { MediaRouterBaseBrowserTest::SetUpOnMainThread(); media_router_ = - MediaRouterMojoImplFactory::GetApiForBrowserContext(browser()->profile()); + MediaRouterFactory::GetApiForBrowserContext(browser()->profile()); DCHECK(media_router_); } diff --git a/chrome/test/media_router/media_router_integration_browsertest.cc b/chrome/test/media_router/media_router_integration_browsertest.cc index 9b7d262..5139fe9 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( |