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

chrome/browser/media/router/media_router_ui_service_factory.cc

Index: chrome/browser/media/router/media_router_ui_service_factory.cc
diff --git a/chrome/browser/media/router/media_router_ui_service_factory.cc b/chrome/browser/media/router/media_router_ui_service_factory.cc
index 73d86b42189171e429b11ecc17c9f581eba0bad4..a14c0f1b70d12f8a8f5d84e4d382d7c4a838b88c 100644
--- a/chrome/browser/media/router/media_router_ui_service_factory.cc
+++ b/chrome/browser/media/router/media_router_ui_service_factory.cc
@@ -12,6 +12,10 @@
 
 using content::BrowserContext;
 
+namespace {
+bool use_in_tests = false;
+}
+
 namespace media_router {
 
 // static
@@ -27,6 +31,11 @@ MediaRouterUIServiceFactory* MediaRouterUIServiceFactory::GetInstance() {
   return base::Singleton<MediaRouterUIServiceFactory>::get();
 }
 
+// static
+void MediaRouterUIServiceFactory::SetUseInTests() {
+  use_in_tests = true;

[Devlin, 2016/09/20 21:55:48]

Drive-by: this is a little unconventional (and is also never reset, which is bad
for globals in unittests).  What about using SetTestingFactoryAndUse() instead?

[takumif, 2016/09/20 23:38:10]

Changed to calling BuildServiceInstanceFor() directly.

+}
+
 MediaRouterUIServiceFactory::MediaRouterUIServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "MediaRouterUIService",
@@ -49,4 +58,16 @@ KeyedService* MediaRouterUIServiceFactory::BuildServiceInstanceFor(
   return new MediaRouterUIService(Profile::FromBrowserContext(context));
 }
 
+bool MediaRouterUIServiceFactory::ServiceIsCreatedWithBrowserContext() const {
+#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
+  return true;
+#else
+  return false;
+#endif
+}
+
+bool MediaRouterUIServiceFactory::ServiceIsNULLWhileTesting() const {
+  return !use_in_tests;
+}
+
 }  // namespace media_router