[MediaRouter] The minimal change to make everything build on Android.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #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"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 
 using content::WebContents;
 using content::TestNavigationObserver;
@@ skipping 12 matching lines @@
   ~MediaRouterDialogControllerBrowserTest() override {}
 
  protected:
   void SetUpOnMainThread() override {
     // Start with one window with one tab.
     EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
     EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
     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.
     media_router_dialog_ = dialog_controller_->ShowMediaRouterDialog();
     ASSERT_TRUE(media_router_dialog_);
   }
 
-  MediaRouterDialogController* dialog_controller_;
+  MediaRouterDialogControllerImpl* dialog_controller_;
   WebContents* initiator_;
   WebContents* media_router_dialog_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MediaRouterDialogControllerBrowserTest, ShowDialog) {

[imcheng, 2015/07/13 22:04:14]

Looks like we should rename the test class and file name.

   // Waits for the dialog to initialize.
   TestNavigationObserver nav_observer(media_router_dialog_);
   nav_observer.Wait();
 
   // New media router dialog is a constrained window, so the number of
   // tabs is still 1.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_NE(initiator_, media_router_dialog_);
   EXPECT_EQ(media_router_dialog_, dialog_controller_->GetMediaRouterDialog());
 
@@ skipping 38 matching lines @@
 
   // Blocks until the dialog WebContents has been destroyed.
   rph_watcher.Wait();
   dialog_watcher.Wait();
 
   // Entry has been removed.
   EXPECT_FALSE(dialog_controller_->GetMediaRouterDialog());
 }
 
 }  // namespace media_router