[Extensions] Default-enable the toolbar redesign on trunk

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"
@@ skipping 78 matching lines @@
     : toolbar_model_(nullptr),
       use_redesign_(false) {}
 
 ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest(bool use_redesign)
     : toolbar_model_(nullptr),
       use_redesign_(use_redesign) {}
 
 ToolbarActionsBarUnitTest::~ToolbarActionsBarUnitTest() {}
 
 void ToolbarActionsBarUnitTest::SetUp() {
-  if (use_redesign_) {
-    redesign_switch_.reset(new extensions::FeatureSwitch::ScopedOverride(
-        extensions::FeatureSwitch::extension_action_redesign(), true));
-  }
+  redesign_switch_.reset(new extensions::FeatureSwitch::ScopedOverride(
+      extensions::FeatureSwitch::extension_action_redesign(), use_redesign_));
 
   BrowserWithTestWindowTest::SetUp();
   // The toolbar typically displays extension icons, so create some extension
   // test infrastructure.
   extensions::TestExtensionSystem* extension_system =
       static_cast<extensions::TestExtensionSystem*>(
           extensions::ExtensionSystem::Get(profile()));
   extension_system->CreateExtensionService(
       base::CommandLine::ForCurrentProcess(),
       base::FilePath(),
@@ skipping 477 matching lines @@
   // Set the width back to the preferred width. All should be back to normal.
   browser_action_test_util()->SetWidth(
       toolbar_actions_bar()->GetPreferredSize().width());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
   EXPECT_EQ(0u, toolbar_actions_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetEndIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetEndIndexInBounds());
   EXPECT_FALSE(toolbar_actions_bar()->NeedsOverflow());
 }