[MediaRouter] Moved the code useful for Android to MediaRouterDialogController

chrome/browser/ui/toolbar/media_router_action.cc

Index: chrome/browser/ui/toolbar/media_router_action.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action.cc b/chrome/browser/ui/toolbar/media_router_action.cc
index 74959d31f63b63a642b5117abe8c2aafc4bd9c39..cc9425e2e29181180028cb4d9f5b94a518816b76 100644
--- a/chrome/browser/ui/toolbar/media_router_action.cc
+++ b/chrome/browser/ui/toolbar/media_router_action.cc
@@ -5,16 +5,16 @@
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/media/router/media_router_dialog_controller.h"
 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
-using media_router::MediaRouterDialogControllerImpl;
+using media_router::MediaRouterDialogController;
 
 MediaRouterAction::MediaRouterAction(Browser* browser)
     : id_("media_router_action"),
@@ -73,7 +73,7 @@ bool MediaRouterAction::HasPopup(
 }
 
 void MediaRouterAction::HidePopup() {
-  GetMediaRouterDialogController()->CloseMediaRouterDialog();
+  GetMediaRouterDialogController()->HideMediaRouterDialog();
 }
 
 gfx::NativeView MediaRouterAction::GetPopupNativeView() {
@@ -98,13 +98,12 @@ bool MediaRouterAction::ExecuteAction(bool by_user) {
 void MediaRouterAction::UpdateState() {
 }
 
-MediaRouterDialogControllerImpl*
+MediaRouterDialogController*
 MediaRouterAction::GetMediaRouterDialogController() {
   DCHECK(delegate_);
   content::WebContents* web_contents = delegate_->GetCurrentWebContents();
   DCHECK(web_contents);
-  return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
-      web_contents);
+  return MediaRouterDialogController::GetOrCreateForWebContents(web_contents);
 }
 
 bool MediaRouterAction::DisabledClickOpensMenu() const {