Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/ui/webui/media_router/media_router_test.cc

Index: chrome/browser/ui/webui/media_router/media_router_test.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_test.cc b/chrome/browser/ui/webui/media_router/media_router_test.cc
index f5e4382683f51de4220de047db3fb4d064606691..7c653cf572b0958dbb83431834bc10bf0c863852 100644
--- a/chrome/browser/ui/webui/media_router/media_router_test.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_test.cc
@@ -4,12 +4,41 @@
 
 #include "chrome/browser/ui/webui/media_router/media_router_test.h"

[mark a. foltz, 2016/10/17 18:57:40]

This should probably be called "MediaRouterWebUITest" to make it clear it's for
the webui unittests.  Not worth fixing in this patch unless you're especially
motivated though :)

[takumif, 2016/10/27 23:06:38]

Done. Most of the affected files were already in this CL anyways.

 
+#include "chrome/browser/media/router/media_router_ui_service_factory.h"
+#include "chrome/browser/media/router/test_helper.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
 #include "chrome/test/base/dialog_test_browser_window.h"
 
-MediaRouterTest::MediaRouterTest()
-    : feature_override_(extensions::FeatureSwitch::media_router(), true) {}
+std::unique_ptr<KeyedService> BuildMediaRouterUIService(
+    content::BrowserContext* context) {
+  return base::MakeUnique<media_router::MockMediaRouterUIService>(
+      static_cast<Profile*>(context));
+}
+
+std::unique_ptr<KeyedService> BuildToolBarActionsModel(
+    content::BrowserContext* context) {
+  return base::MakeUnique<ToolbarActionsModel>(static_cast<Profile*>(context),
+                                               nullptr);
+}
+
+MediaRouterTest::MediaRouterTest() : MediaRouterTest(false) {}
+MediaRouterTest::MediaRouterTest(bool require_mock_ui_service)
+    : feature_override_(extensions::FeatureSwitch::media_router(), true),
+      require_mock_ui_service_(require_mock_ui_service) {}
+
+MediaRouterTest::~MediaRouterTest() {}
 
-MediaRouterTest::~MediaRouterTest() {
+TestingProfile* MediaRouterTest::CreateProfile() {
+  TestingProfile::Builder builder;
+  if (require_mock_ui_service_) {

[mark a. foltz, 2016/10/17 18:57:40]

Nice.  I would create a separate flag for require_mock_toolbar_factory so it's
explicit to callers which mocks are being used.

[takumif, 2016/10/27 23:06:38]

ToolbarActionsModel is a dependency for the MRUIService, so we can't separate
them into two flags. Also we're using real ToolbarActionsModel, not a mocked
one.

+    builder.AddTestingFactory(
+        media_router::MediaRouterUIServiceFactory::GetInstance(),
+        BuildMediaRouterUIService);
+    builder.AddTestingFactory(ToolbarActionsModelFactory::GetInstance(),
+                              BuildToolBarActionsModel);
+  }
+  return builder.Build().release();
 }
 
 BrowserWindow* MediaRouterTest::CreateBrowserWindow() {