[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.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 "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 53 matching lines @@
     : toolbar_model_(nullptr) {
 }
 
 BrowserActionsBarBrowserTest::~BrowserActionsBarBrowserTest() {
 }
 
 void BrowserActionsBarBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   ToolbarActionsBar::disable_animations_for_testing_ = true;
-  // These tests are deliberately testing behavior without the redesign.
-  // Forcefully disable it.
-  override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), true));
 }
 
 void BrowserActionsBarBrowserTest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
   browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
   toolbar_model_ = ToolbarActionsModel::Get(profile());
 }
 
 void BrowserActionsBarBrowserTest::TearDownOnMainThread() {
   ToolbarActionsBar::disable_animations_for_testing_ = false;
@@ skipping 17 matching lines @@
     EXPECT_TRUE(registry->enabled_extensions().GetByID(extensions[i]->id())) <<
         extensions[i]->name();
     EXPECT_EQ(static_cast<int>(i + 1),
               browser_actions_bar_->NumberOfBrowserActions());
     EXPECT_TRUE(browser_actions_bar_->HasIcon(i));
     EXPECT_EQ(static_cast<int>(i + 1),
               browser_actions_bar()->VisibleBrowserActions());
   }
 }
 
-// BrowserActionsBarLegacyBrowserTest:
-
-BrowserActionsBarLegacyBrowserTest::BrowserActionsBarLegacyBrowserTest() {
-}
-
-BrowserActionsBarLegacyBrowserTest::~BrowserActionsBarLegacyBrowserTest() {
-}
-
-void BrowserActionsBarLegacyBrowserTest::SetUpCommandLine(
-    base::CommandLine* command_line) {
-  BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);
-  // Override to force the redesign. Completely clear the previous override
-  // first, since doing so resets the value of the switch.
-  override_redesign_.reset();
-  override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), false));
-}
-
 // Test the basic functionality.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarLegacyBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, Basic) {
   // Load an extension with no browser action.
   extension_service()->AddExtension(CreateExtension("alpha", false).get());
-  // This extension should not be in the model (has no browser action).
-  EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions());
-
-  // Load an extension with a browser action.
-  extension_service()->AddExtension(CreateExtension("beta", true).get());
+  // This extension should be present in the model (it will receive a
+  // synthesized action).
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_TRUE(browser_actions_bar()->HasIcon(0));
 
-  // Unload the extension.
-  std::string id = browser_actions_bar()->GetExtensionId(0);
+  // Load an extension with a browser action; it will also be in the toolbar.
+  extension_service()->AddExtension(CreateExtension("beta", true).get());
+  EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
+  EXPECT_TRUE(browser_actions_bar()->HasIcon(1));
+
+  // Unload the extension; the icon should be removed.
+  std::string id = browser_actions_bar()->GetExtensionId(1);
   UnloadExtension(id);
-  EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions());
+  EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
 }
 
 // Test moving various browser actions. This is not to check the logic of the
 // move (that's in the toolbar model tests), but just to check our ui.
 IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, MoveBrowserActions) {
   LoadExtensions();
 
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
 
@@ skipping 14 matching lines @@
   EXPECT_EQ(extension_a()->id(), browser_actions_bar()->GetExtensionId(1));
   EXPECT_EQ(extension_b()->id(), browser_actions_bar()->GetExtensionId(2));
 
   // Move B to middle position. Order is C B A.
   toolbar_model()->MoveActionIcon(extension_b()->id(), 1);
   EXPECT_EQ(extension_c()->id(), browser_actions_bar()->GetExtensionId(0));
   EXPECT_EQ(extension_b()->id(), browser_actions_bar()->GetExtensionId(1));
   EXPECT_EQ(extension_a()->id(), browser_actions_bar()->GetExtensionId(2));
 }
 
-// Test that explicitly hiding an extension action results in it disappearing
-// from the browser actions bar.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarLegacyBrowserTest, ForceHide) {
-  LoadExtensions();
-
-  EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_EQ(extension_a()->id(), browser_actions_bar()->GetExtensionId(0));
-  // Force hide one of the extensions' browser action.
-  extensions::ExtensionActionAPI::Get(browser()->profile())->
-      SetBrowserActionVisibility(extension_a()->id(), false);
-  // The browser action for Extension A should be removed.
-  EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_EQ(extension_b()->id(), browser_actions_bar()->GetExtensionId(0));
-}
-
 IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, Visibility) {
   LoadExtensions();
 
   // Change container to show only one action, rest in overflow: A, [B, C].
   toolbar_model()->SetVisibleIconCount(1);
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
 
   // Disable extension A (should disappear). State becomes: B [C].
   DisableExtension(extension_a()->id());
   EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
@@ skipping 462 matching lines @@
   ASSERT_EQ(1u, actions.size());
   gfx::Image icon = actions[0]->GetIcon(
       second_browser->tab_strip_model()->GetActiveWebContents(),
       gfx::Size(ToolbarActionsBar::IconWidth(false),
                 ToolbarActionsBar::IconHeight()));
   const gfx::ImageSkia* skia = icon.ToImageSkia();
   ASSERT_TRUE(skia);
   // Force the image to try and load a representation.
   skia->GetRepresentation(2.0);
 }