Create MediaRouterActionController and MediaRouterUIService

chrome/browser/media/router/media_router_factory.cc

Index: chrome/browser/media/router/media_router_factory.cc
diff --git a/chrome/browser/media/router/media_router_factory.cc b/chrome/browser/media/router/media_router_factory.cc
index 64ba1cae327381180dc5f9ccbafbbd406adebed3..9e1e0ab204a8b2a12a5365fabcf100744b19409d 100644
--- a/chrome/browser/media/router/media_router_factory.cc
+++ b/chrome/browser/media/router/media_router_factory.cc
@@ -38,6 +38,11 @@ MediaRouter* MediaRouterFactory::GetApiForBrowserContext(
       service_factory.Get().GetServiceForBrowserContext(context, true));
 }
 
+// static
+MediaRouterFactory* MediaRouterFactory::GetInstance() {
+  return &service_factory.Get();
+}
+
 void MediaRouterFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   if (context->IsOffTheRecord()) {
@@ -62,11 +67,6 @@ MediaRouterFactory::MediaRouterFactory()
 MediaRouterFactory::~MediaRouterFactory() {
 }
 
-// static
-MediaRouterFactory* MediaRouterFactory::GetMediaRouterFactoryForTest() {
-  return &service_factory.Get();
-}
-
 content::BrowserContext* MediaRouterFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);