Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 
 #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"
 
 using extensions::ComponentMigrationHelper;
 
 class FakeComponentActionDelegate
     : public ComponentMigrationHelper::ComponentActionDelegate {
  public:
   FakeComponentActionDelegate() {}
   ~FakeComponentActionDelegate() {}
@@ skipping 14 matching lines @@
 
   bool HasComponentAction(const std::string& action_id) const override {
     EXPECT_EQ(action_id, ComponentToolbarActionsFactory::kMediaRouterActionId);
     return has_media_router_action_;
   }
 
  private:
   bool has_media_router_action_ = false;
 };
 
-class MediaRouterActionControllerUnitTest : public MediaRouterTest {
+class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
  public:
   MediaRouterActionControllerUnitTest()
       : issue_(media_router::Issue(
             "title notification",
             "message notification",
             media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
             std::vector<media_router::IssueAction>(),
             "route_id",
             media_router::Issue::NOTIFICATION,
             false,
             -1)),
         source1_("fakeSource1"),
         source2_("fakeSource2") {}
 
   ~MediaRouterActionControllerUnitTest() override {}
 
-  // MediaRouterTest:
+  // MediaRouterWebUITest:
   void SetUp() override {
-    MediaRouterTest::SetUp();
+    MediaRouterWebUITest::SetUp();
 
     router_.reset(new media_router::MockMediaRouter());
     component_action_delegate_.reset(new FakeComponentActionDelegate());
     component_migration_helper_.reset(new ComponentMigrationHelper(
         profile(), component_action_delegate_.get()));
     controller_.reset(new MediaRouterActionController(
         profile(), router_.get(), component_action_delegate_.get(),
         component_migration_helper_.get()));
 
     SetAlwaysShowActionPref(false);
 
     local_display_route_list_.push_back(
         media_router::MediaRoute("routeId1", source1_, "sinkId1", "description",
                                  true, std::string(), true));
     non_local_display_route_list_.push_back(
         media_router::MediaRoute("routeId2", source1_, "sinkId2", "description",
                                  false, std::string(), true));
     non_local_display_route_list_.push_back(
         media_router::MediaRoute("routeId3", source2_, "sinkId3", "description",
                                  true, std::string(), false));
   }
 
   void TearDown() override {
     controller_.reset();
     component_migration_helper_.reset();
     component_action_delegate_.reset();
     router_.reset();
-    MediaRouterTest::TearDown();
+    MediaRouterWebUITest::TearDown();
   }
 
   bool ActionExists() {
     return component_action_delegate_->HasComponentAction(
         ComponentToolbarActionsFactory::kMediaRouterActionId);
   }
 
   void SetAlwaysShowActionPref(bool always_show) {
     component_migration_helper_->SetComponentActionPref(
         ComponentToolbarActionsFactory::kMediaRouterActionId, always_show);
@@ skipping 26 matching lines @@
   const media_router::MediaSource source1_;
   const media_router::MediaSource source2_;
 
   std::vector<media_router::MediaRoute> local_display_route_list_;
   std::vector<media_router::MediaRoute> non_local_display_route_list_;
   std::vector<media_router::MediaRoute::Id> empty_route_id_list_;
 
   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.
   controller()->OnRoutesUpdated(local_display_route_list(),
                                 empty_route_id_list());
   EXPECT_TRUE(controller()->has_local_display_route_);
   EXPECT_TRUE(ActionExists());
   // Removing the local route should hide the icon.
   controller()->OnRoutesUpdated(non_local_display_route_list(),
                                 empty_route_id_list());
@@ skipping 14 matching lines @@
                                 empty_route_id_list());
   controller()->OnIssueUpdated(nullptr);
   // When the issue disappears, the icon should remain visible if there's
   // a local route.
   EXPECT_TRUE(ActionExists());
   controller()->OnRoutesUpdated(std::vector<media_router::MediaRoute>(),
                                 empty_route_id_list());
   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());
 
   SetAlwaysShowActionPref(true);
   EXPECT_TRUE(ActionExists());
 
   controller()->OnRoutesUpdated(local_display_route_list(),
                                 empty_route_id_list());
   SetAlwaysShowActionPref(false);
   // Unchecking the option while having a local route shouldn't hide the icon.
   EXPECT_TRUE(ActionExists());
 
   SetAlwaysShowActionPref(true);
   controller()->OnRoutesUpdated(non_local_display_route_list(),
                                 empty_route_id_list());
   // Removing the local route should not hide the icon.
   EXPECT_TRUE(ActionExists());
 
   SetAlwaysShowActionPref(false);
   EXPECT_FALSE(ActionExists());
 }