Show media router toolbar icon ephemerally for active local routes and issues

chrome/browser/media/router/media_router_ui_service_factory.h

Index: chrome/browser/media/router/media_router_ui_service_factory.h
diff --git a/chrome/browser/media/router/media_router_ui_service_factory.h b/chrome/browser/media/router/media_router_ui_service_factory.h
index f4d54b4386904650c2f1f996f275600c519561d9..c67224ac77150f5b34fcdf44714f284049277aaa 100644
--- a/chrome/browser/media/router/media_router_ui_service_factory.h
+++ b/chrome/browser/media/router/media_router_ui_service_factory.h
@@ -23,6 +23,10 @@ class MediaRouterUIServiceFactory : public BrowserContextKeyedServiceFactory {
 
   static MediaRouterUIServiceFactory* GetInstance();
 
+  // By default, this factory returns a NULL service for TestingBrowserContext.
+  // Call this method to make it return a non-NULL service.
+  static void SetUseInTests();
+
  private:
   friend struct base::DefaultSingletonTraits<MediaRouterUIServiceFactory>;
 
@@ -34,6 +38,8 @@ class MediaRouterUIServiceFactory : public BrowserContextKeyedServiceFactory {
       content::BrowserContext* context) const override;
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
+  bool ServiceIsCreatedWithBrowserContext() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterUIServiceFactory);
 };