Fixing flaky overscroll and touch exploration mode browser tests.

chrome/browser/chromeos/accessibility/touch_exploration_controller_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 "ui/chromeos/touch_exploration_controller.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 16 matching lines @@
     ash::AccessibilityDelegate* ad =
         ash::Shell::GetInstance()->accessibility_delegate();
     if (on != ad->IsSpokenFeedbackEnabled())
       ad->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
   }
 
 private:
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest);
 };
 
-IN_PROC_BROWSER_TEST_F(TouchExplorationTest, PRE_ToggleOnOff) {
+//IN_PROC_BROWSER_TEST_F(TouchExplorationTest, PRE_ToggleOnOff) {
   // TODO (mfomitchev): If the test is run by itself, there is a resize at the
   //  very beginning. An in-progress resize creates a "resize lock" in
   // RenderWidgetHostViewAura, which calls
   // WindowEventDispatcher::HoldPointerMoves(), which prevents mouse events from
   // coming through. Adding a PRE_ test ensures the resize completes before the
   // actual test is executed. sadrul@ says the resize shouldn't be even
   // happening, so this needs to be looked at further.
-}
+//}
 
 // This test turns the touch exploration mode on/off and confirms that events
 // get rewritten when the touch exploration mode is on, and aren't affected
 // after the touch exploration mode is turned off.
 IN_PROC_BROWSER_TEST_F(TouchExplorationTest, ToggleOnOff) {
   aura::Window* root_window = ash::Shell::GetInstance()->GetPrimaryRootWindow();
   scoped_ptr<ui::test::TestEventHandler>
       event_handler(new ui::test::TestEventHandler());
   root_window->AddPreTargetHandler(event_handler.get());
   SwitchTouchExplorationMode(true);
@@ skipping 14 matching lines @@
   SwitchTouchExplorationMode(true);
   generator.PressTouchId(2);
   EXPECT_GT(event_handler->num_mouse_events(), 0);
   EXPECT_EQ(0, event_handler->num_touch_events());
 
   SwitchTouchExplorationMode(false);
   root_window->RemovePreTargetHandler(event_handler.get());
 }
 
 }  // namespace ui