[Extensions UI] Highlight toolbar extensions when the redesign bubble is active

chrome/browser/extensions/extension_toolbar_model_unittest.cc

 // Copyright 2014 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 "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/test_extension_dir.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/pref_names.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/value_builder.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif
 
@@ skipping 515 matching lines @@
   EXPECT_EQ(3u, toolbar_model()->visible_icon_count());
   EXPECT_EQ(extension_b.get(), GetExtensionAtIndex(0u));
   EXPECT_EQ(extension_a.get(), GetExtensionAtIndex(1u));
   EXPECT_EQ(extension_d.get(), GetExtensionAtIndex(2u));
   EXPECT_EQ(extension_c.get(), GetExtensionAtIndex(3u));
 }
 
 TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarHighlightMode) {
   Init();
 
-  EXPECT_FALSE(toolbar_model()->HighlightExtensions(ExtensionIdList()));
+  EXPECT_FALSE(toolbar_model()->HighlightExtensions(
+      ExtensionIdList(), ExtensionToolbarModel::HIGHLIGHT_WARNING));
   EXPECT_EQ(0, observer()->highlight_mode_count());
 
   // Add the three browser action extensions.
   ASSERT_TRUE(AddBrowserActionExtensions());
   EXPECT_EQ(3u, num_toolbar_items());
 
+  // Start with a visible count of 2 (non-zero, and not all).
+  toolbar_model()->SetVisibleIconCount(2u);
+
   // Highlight one extension.
   ExtensionIdList extension_ids;
   extension_ids.push_back(browser_action_b()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(1, observer()->highlight_mode_count());
   EXPECT_TRUE(toolbar_model()->is_highlighting());
 
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(0u));
+  EXPECT_EQ(1u, toolbar_model()->visible_icon_count());
 
   // Stop highlighting.
   toolbar_model()->StopHighlighting();
   EXPECT_EQ(0, observer()->highlight_mode_count());
   EXPECT_FALSE(toolbar_model()->is_highlighting());
 
   // Verify that the extensions are back to normal.
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2u));
+  EXPECT_EQ(2u, toolbar_model()->visible_icon_count());
 
   // Call stop highlighting a second time (shouldn't be notified).
   toolbar_model()->StopHighlighting();
   EXPECT_EQ(0, observer()->highlight_mode_count());
   EXPECT_FALSE(toolbar_model()->is_highlighting());
 
   // Highlight all extensions.
   extension_ids.clear();
   extension_ids.push_back(browser_action_a()->id());
   extension_ids.push_back(browser_action_b()->id());
   extension_ids.push_back(browser_action_c()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(1, observer()->highlight_mode_count());
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2u));
+  EXPECT_EQ(3u, toolbar_model()->visible_icon_count());
+  // Even though the visible count is 3, we shouldn't adjust the stored
+  // preference.
+  EXPECT_EQ(2, profile()->GetPrefs()->GetInteger(pref_names::kToolbarSize));
 
   // Highlight only extension b (shrink the highlight list).
   extension_ids.clear();
   extension_ids.push_back(browser_action_b()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(2, observer()->highlight_mode_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(0u));
 
   // Highlight extensions a and b (grow the highlight list).
   extension_ids.clear();
   extension_ids.push_back(browser_action_a()->id());
   extension_ids.push_back(browser_action_b()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(3, observer()->highlight_mode_count());
   EXPECT_EQ(2u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
 
   // Highlight no extensions (empty the highlight list).
   extension_ids.clear();
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(2, observer()->highlight_mode_count());
   EXPECT_FALSE(toolbar_model()->is_highlighting());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2u));
+
+  // Our toolbar size should be back to normal.
+  EXPECT_EQ(2u, toolbar_model()->visible_icon_count());
+  EXPECT_EQ(2, profile()->GetPrefs()->GetInteger(pref_names::kToolbarSize));
 }
 
 TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarHighlightModeRemove) {
   Init();
 
   // Add the three browser action extensions.
   ASSERT_TRUE(AddBrowserActionExtensions());
   EXPECT_EQ(3u, num_toolbar_items());
 
   // Highlight two of the extensions.
   ExtensionIdList extension_ids;
   extension_ids.push_back(browser_action_a()->id());
   extension_ids.push_back(browser_action_b()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_TRUE(toolbar_model()->is_highlighting());
   EXPECT_EQ(1, observer()->highlight_mode_count());
   EXPECT_EQ(2u, num_toolbar_items());
 
   // Disable one of them - only one should remain highlighted.
   service()->DisableExtension(browser_action_a()->id(),
                               Extension::DISABLE_USER_ACTION);
   EXPECT_TRUE(toolbar_model()->is_highlighting());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(0u));
 
   // Uninstall the remaining highlighted extension. This should result in
   // highlight mode exiting.
   service()->UninstallExtension(browser_action_b()->id(),
                                 UNINSTALL_REASON_FOR_TESTING,
                                 base::Bind(&base::DoNothing),
                                 NULL);  // Ignore error.
   EXPECT_FALSE(toolbar_model()->is_highlighting());
   EXPECT_EQ(0, observer()->highlight_mode_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(0u));
 
   // Test that removing an unhighlighted extension still works.
   // Reinstall extension b, and then highlight extension c.
   ASSERT_TRUE(AddExtension(browser_action_b()));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   extension_ids.clear();
   extension_ids.push_back(browser_action_c()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_EQ(1, observer()->highlight_mode_count());
   EXPECT_TRUE(toolbar_model()->is_highlighting());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(0u));
 
   // Uninstalling b should not have visible impact.
   service()->UninstallExtension(browser_action_b()->id(),
                                 UNINSTALL_REASON_FOR_TESTING,
                                 base::Bind(&base::DoNothing),
                                 NULL);  // Ignore error.
@@ skipping 16 matching lines @@
   // Add the three browser action extensions.
   ASSERT_TRUE(AddBrowserActionExtensions());
   EXPECT_EQ(3u, num_toolbar_items());
 
   // Remove one (down to two).
   ASSERT_TRUE(RemoveExtension(browser_action_c()));
 
   // Highlight one of the two extensions.
   ExtensionIdList extension_ids;
   extension_ids.push_back(browser_action_a()->id());
-  toolbar_model()->HighlightExtensions(extension_ids);
+  toolbar_model()->HighlightExtensions(
+      extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
   EXPECT_TRUE(toolbar_model()->is_highlighting());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
 
   // Adding a new extension should have no visible effect.
   ASSERT_TRUE(AddExtension(browser_action_c()));
   EXPECT_TRUE(toolbar_model()->is_highlighting());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
 
@@ skipping 415 matching lines @@
                         .SetLocation(Manifest::COMPONENT)
                         .Build();
   service()->AddExtension(component_extension.get());
 
   EXPECT_EQ(component_extension.get(), GetExtensionAtIndex(0));
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(1));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(2));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(3));
 }
 
+TEST_F(ExtensionToolbarModelUnitTest,
+       ToolbarModelHighlightsForToolbarRedesign) {
+  FeatureSwitch::ScopedOverride enable_redesign(
+      FeatureSwitch::extension_action_redesign(), true);
+  InitializeEmptyExtensionService();
+  EXPECT_TRUE(AddActionExtensions());
+  ExtensionToolbarModel* toolbar_model =
+      extension_action_test_util::CreateToolbarModelForProfile(profile());
+  EXPECT_TRUE(toolbar_model);
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
+      profile()));
+  EXPECT_TRUE(toolbar_model->is_highlighting());
+  EXPECT_EQ(ExtensionToolbarModel::HIGHLIGHT_INFO,
+            toolbar_model->highlight_type());
+  EXPECT_EQ(3u, toolbar_model->visible_icon_count());
+  EXPECT_EQ(3u, toolbar_model->toolbar_items().size());
+
+  scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble(
+      new ExtensionToolbarIconSurfacingBubbleDelegate(profile()));
+  bubble->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
+
+  EXPECT_FALSE(toolbar_model->is_highlighting());
+  EXPECT_EQ(ExtensionToolbarModel::HIGHLIGHT_NONE,
+            toolbar_model->highlight_type());
+}
+
 }  // namespace extensions