Fix test failures in ToolbarViewInteractiveUITest.TestWrenchMenuOpensOnDrag

chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.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/run_loop.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
@@ skipping 30 matching lines @@
   // DoDragAndDrop.
   void TestWhileInDragOperation();
 
  private:
   // Finishes the drag-and-drop operation started in DoDragAndDrop().
   void FinishDragAndDrop(const base::Closure& quit_closure);
 
   // InProcessBrowserTest:
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   ToolbarView* toolbar_view_;
 
   BrowserActionsContainer* browser_actions_;
 
   // The drag-and-drop background thread.
   scoped_ptr<base::Thread> dnd_thread_;
 
   // Override the extensions-action-redesign switch.
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_;
@@ skipping 57 matching lines @@
       quit_closure);
 }
 
 void ToolbarViewInteractiveUITest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   // We do this before the rest of the setup because it can affect how the views
   // are constructed.
   feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::extension_action_redesign(), true));
+  BrowserActionsContainer::disable_animations_during_testing_ = true;
+  WrenchToolbarButton::g_open_wrench_immediately_for_testing = true;
 }
 
 void ToolbarViewInteractiveUITest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
 
   toolbar_view_ = BrowserView::GetBrowserViewForBrowser(browser())->toolbar();
   browser_actions_ = toolbar_view_->browser_actions();
 }
 
+void ToolbarViewInteractiveUITest::TearDownOnMainThread() {
+  BrowserActionsContainer::disable_animations_during_testing_ = false;
+  WrenchToolbarButton::g_open_wrench_immediately_for_testing = false;
+}
+
 IN_PROC_BROWSER_TEST_F(ToolbarViewInteractiveUITest,
                        MAYBE(TestWrenchMenuOpensOnDrag)) {
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-  WrenchToolbarButton::g_open_wrench_immediately_for_testing = true;
-
   // Load an extension that has a browser action.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("basics")));
   base::RunLoop().RunUntilIdle();  // Ensure the extension is fully loaded.
 
   ASSERT_EQ(1u, browser_actions()->VisibleBrowserActions());
 
   BrowserActionView* view = browser_actions()->GetBrowserActionViewAt(0);
   ASSERT_TRUE(view);
 
   gfx::Point browser_action_view_loc = test::GetCenterInScreenCoordinates(view);
   gfx::Point wrench_button_loc =
       test::GetCenterInScreenCoordinates(toolbar_view()->app_menu());
 
   // Perform a drag and drop from the browser action view to the wrench button,
   // which should open the wrench menu.
   DoDragAndDrop(browser_action_view_loc, wrench_button_loc);
 }