Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/media/router/media_router_dialog_controller_unittest.cc

Index: chrome/browser/media/router/media_router_dialog_controller_unittest.cc
diff --git a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
index 5aef99fe785ee1d519978a87108e35c2a7c93579..44dbeb578ede3bd22e2a92d899524a0bf82c37a7 100644
--- a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
+++ b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/media/router/create_presentation_connection_request.h"
 #include "chrome/browser/media/router/media_router_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/features.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
@@ -78,11 +79,15 @@ class MediaRouterDialogControllerTest : public ChromeRenderViewHostTestHarness {
   std::unique_ptr<MockWebContentsDelegate> web_contents_delegate_;
 };
 
+#if BUILDFLAG(ANDROID_JAVA_UI)
+// The non-Android implementation is tested in

[msw, 2016/11/04 00:07:16]

Why doesn't this work anymore on non-android builds?

[takumif, 2016/11/09 04:37:27]

The desktop version instantiates MediaRouterDialogControllerImpl that now
depends on MediaRouterActionController, which requires lots of desktop-specific
code to be set up, and we can't really inject a mock version of
MediaRouterActionController here.

[msw, 2016/11/09 20:32:33]

Hmm, okay, I guess...

+// MediaRouterDialogControllerImplTest.
 TEST_F(MediaRouterDialogControllerTest, CreateForWebContents) {
   MediaRouterDialogController* dialog_controller =
       MediaRouterDialogController::GetOrCreateForWebContents(web_contents());
   ASSERT_NE(dialog_controller, nullptr);
 }
+#endif
 
 TEST_F(MediaRouterDialogControllerTest, ShowAndHideDialog) {
   EXPECT_CALL(*web_contents_delegate_, ActivateContents(web_contents()));