Create MediaRouterActionController and MediaRouterUIService

chrome/browser/media/router/media_router_factory.h

Index: chrome/browser/media/router/media_router_factory.h
diff --git a/chrome/browser/media/router/media_router_factory.h b/chrome/browser/media/router/media_router_factory.h
index d85a043d47f5ae70a6752972e7b5daacb6171daa..95c93c22cd5d85f7355e674e4c260a5e3ccd3115 100644
--- a/chrome/browser/media/router/media_router_factory.h
+++ b/chrome/browser/media/router/media_router_factory.h
@@ -24,6 +24,8 @@ class MediaRouterFactory : public BrowserContextKeyedServiceFactory {
  public:
   static MediaRouter* GetApiForBrowserContext(content::BrowserContext* context);
 
+  static MediaRouterFactory* GetInstance();
+
  protected:
   // We override the shutdown method for the factory to give the Media Router a
   // chance to remove incognito media routes.
@@ -37,9 +39,6 @@ class MediaRouterFactory : public BrowserContextKeyedServiceFactory {
   MediaRouterFactory();
   ~MediaRouterFactory() override;
 
-  // Exposed for testing.
-  static MediaRouterFactory* GetMediaRouterFactoryForTest();
-
   // BrowserContextKeyedServiceFactory interface.
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;