[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/toolbar/toolbar_actions_bar_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 "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/feature_switch.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 
 namespace {
 
 // Verifies that the toolbar order matches for the given |actions_bar|. If the
 // order matches, the return value is empty; otherwise, it contains the error.
 std::string VerifyToolbarOrderForBar(
     const ToolbarActionsBar* actions_bar,
     BrowserActionTestUtil* browser_action_test_util,
     const char* expected_names[],
@@ skipping 69 matching lines @@
       false);
   toolbar_model_ =
       extensions::extension_action_test_util::CreateToolbarModelForProfile(
           profile());
 
   material_design_state_.reset(
       new ui::test::MaterialDesignControllerTestAPI(GetParam()));
   ToolbarActionsBar::disable_animations_for_testing_ = true;
   browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
 
-  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
-    overflow_browser_action_test_util_ =
-        browser_action_test_util_->CreateOverflowBar();
-  }
+  overflow_browser_action_test_util_ =
+      browser_action_test_util_->CreateOverflowBar();
 }
 
 void ToolbarActionsBarUnitTest::TearDown() {
   // Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(),
   // we need to delete this now.
   browser_action_test_util_.reset();
   overflow_browser_action_test_util_.reset();
   ToolbarActionsBar::disable_animations_for_testing_ = false;
   material_design_state_.reset();
   local_state_.reset();
@@ skipping 30 matching lines @@
     const char* expected_names[],
     size_t total_size,
     size_t visible_count) {
   std::string main_bar_error =
       VerifyToolbarOrderForBar(toolbar_actions_bar(),
                                browser_action_test_util(),
                                expected_names,
                                total_size,
                                visible_count);
   std::string overflow_bar_error;
-  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
-    overflow_bar_error =
-        VerifyToolbarOrderForBar(overflow_bar(),
-                                 overflow_browser_action_test_util(),
-                                 expected_names,
-                                 total_size,
-                                 total_size - visible_count);
-
-  }
+  overflow_bar_error = VerifyToolbarOrderForBar(
+      overflow_bar(), overflow_browser_action_test_util(), expected_names,
+      total_size, total_size - visible_count);
 
   return main_bar_error.empty() && overflow_bar_error.empty() ?
       testing::AssertionSuccess() :
       testing::AssertionFailure() << "main bar error:\n" << main_bar_error <<
           "overflow bar error:\n" << overflow_bar_error;
 }
 
 // Note: First argument is optional and intentionally left blank.
 // (it's a prefix for the generated test cases)
 INSTANTIATE_TEST_CASE_P(
@@ skipping 383 matching lines @@
       extensions::extension_action_test_util::BROWSER_ACTION);
   toolbar_model()->SetVisibleIconCount(0u);
   {
     base::RunLoop run_loop;
     toolbar_actions_bar()->PopOutAction(action, true, run_loop.QuitClosure());
     run_loop.Run();
   }
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
   EXPECT_TRUE(toolbar_actions_bar()->NeedsOverflow());
 }