Revert of [Extensions Toolbar] Add a finch config for the redesign

chrome/browser/ui/location_bar/location_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 "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.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"
@@ skipping 36 matching lines @@
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // Load an extension with a PageAction that sends a message when clicked.
   const extensions::Extension* LoadPageActionExtension(
       extensions::TestExtensionDir* dir);
 
  private:
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_override_;
-  scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarBrowserTest);
 };
 
 void LocationBarBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   // In order to let a vanilla extension override the bookmark star, we have to
   // enable the switch.
   enable_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::enable_override_bookmarks_ui(), true));
-  // For testing page actions in the location bar, we also have to be sure to
-  // *not* have the redesign turned on.
-  enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), false));
   ExtensionBrowserTest::SetUpCommandLine(command_line);
 }
 
 const extensions::Extension* LocationBarBrowserTest::LoadPageActionExtension(
     extensions::TestExtensionDir* dir) {
   DCHECK(dir);
 
   dir->WriteManifest(base::StringPrintf(kManifestSource, "page_action1"));
   dir->WriteFile(FILE_PATH_LITERAL("background.js"), kBackgroundScriptSource);
 
@@ skipping 128 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   int tab_id = SessionTabHelper::IdForTab(tab);
   action->SetIsVisible(tab_id, true);
   extensions::ExtensionActionAPI::Get(profile())->NotifyChange(
       action, tab, profile());
 
   // We should still have no page actions.
   EXPECT_EQ(0, location_bar->PageActionCount());
   EXPECT_EQ(0, location_bar->PageActionVisibleCount());
 }