Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc

Index: chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
index 6f25b895dd61e4b76709547829ab0b8f3b7a583f..01f254ef3e95d747c9e46526d1f59c7beb892d72 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
-#include "chrome/browser/ui/webui/media_router/media_router_test.h"
+#include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -43,7 +43,7 @@ class FakeComponentActionDelegate
   bool has_media_router_action_ = false;
 };
 
-class MediaRouterActionControllerUnitTest : public MediaRouterTest {
+class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
  public:
   MediaRouterActionControllerUnitTest()
       : issue_(media_router::Issue(
@@ -60,9 +60,9 @@ class MediaRouterActionControllerUnitTest : public MediaRouterTest {
 
   ~MediaRouterActionControllerUnitTest() override {}
 
-  // MediaRouterTest:
+  // MediaRouterWebUITest:
   void SetUp() override {
-    MediaRouterTest::SetUp();
+    MediaRouterWebUITest::SetUp();
 
     router_.reset(new media_router::MockMediaRouter());
     component_action_delegate_.reset(new FakeComponentActionDelegate());
@@ -90,7 +90,7 @@ class MediaRouterActionControllerUnitTest : public MediaRouterTest {
     component_migration_helper_.reset();
     component_action_delegate_.reset();
     router_.reset();
-    MediaRouterTest::TearDown();
+    MediaRouterWebUITest::TearDown();
   }
 
   bool ActionExists() {
@@ -137,7 +137,7 @@ class MediaRouterActionControllerUnitTest : public MediaRouterTest {
   DISALLOW_COPY_AND_ASSIGN(MediaRouterActionControllerUnitTest);
 };
 
-TEST_F(MediaRouterActionControllerUnitTest, EphemeralIcon) {
+TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForRoutesAndIssues) {
   EXPECT_FALSE(ActionExists());
 
   // Creating a local route should show the action icon.
@@ -172,6 +172,34 @@ TEST_F(MediaRouterActionControllerUnitTest, EphemeralIcon) {
   EXPECT_FALSE(ActionExists());
 }
 
+TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForDialog) {
+  EXPECT_FALSE(ActionExists());
+
+  // Showing a dialog should show the icon.
+  controller()->OnDialogShown();
+  EXPECT_TRUE(ActionExists());
+  // Showing and hiding a dialog shouldn't hide the icon as long as we have a
+  // positive number of dialogs.
+  controller()->OnDialogShown();
+  EXPECT_TRUE(ActionExists());
+  controller()->OnDialogHidden();
+  EXPECT_TRUE(ActionExists());
+  // When we have zero dialogs, the icon should be hidden.
+  controller()->OnDialogHidden();
+  EXPECT_FALSE(ActionExists());
+
+  controller()->OnDialogShown();
+  EXPECT_TRUE(ActionExists());
+  controller()->OnRoutesUpdated(local_display_route_list(),
+                                empty_route_id_list());
+  // Hiding the dialog while there are local routes shouldn't hide the icon.

[mark a. foltz, 2016/11/01 02:00:08]

Add one more test case for hiding dialog + issue shown

[takumif, 2016/11/02 03:16:54]

Done.

+  controller()->OnDialogHidden();
+  EXPECT_TRUE(ActionExists());
+  controller()->OnRoutesUpdated(non_local_display_route_list(),
+                                empty_route_id_list());
+  EXPECT_FALSE(ActionExists());
+}
+
 TEST_F(MediaRouterActionControllerUnitTest, ObserveAlwaysShowPrefChange) {
   EXPECT_FALSE(ActionExists());