[GTTF] Miscellanous UI tests cleanups:

chrome/test/ui/mouseleave_uitest.cc

 // Copyright (c) 2009 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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 11 matching lines @@
 #include "views/event.h"
 
 #if defined(OS_MACOSX)
 // window->GetViewBounds is not implemented
 // window->SimulateOSMouseMove is not implemented
 // http://code.google.com/p/chromium/issues/detail?id=26102
 #define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut
 #elif defined(OS_WIN)
 // Test succeeds locally, flaky on trybot
 // http://code.google.com/p/chromium/issues/detail?id=26349
-#define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut
+#define MAYBE_TestOnMouseOut FLAKY_TestOnMouseOut
 #endif
 
 namespace {
 
 class MouseLeaveTest : public UITest {
  public:
   MouseLeaveTest() {
     dom_automation_enabled_ = true;
     show_window_ = true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(MouseLeaveTest);
 };
 
 TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) {
   GURL test_url = GetTestUrl(L"", L"mouseleave.html");
 
+  scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
+  ASSERT_TRUE(browser.get());
+  scoped_refptr<WindowProxy> window = browser->GetWindow();
+  ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
-  scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
-  scoped_refptr<WindowProxy> window = browser->GetWindow();
 
   gfx::Rect tab_view_bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &tab_view_bounds,
                                     true));
   gfx::Point in_content_point(
       tab_view_bounds.x() + tab_view_bounds.width() / 2,
       tab_view_bounds.y() + 10);
   gfx::Point above_content_point(
       tab_view_bounds.x() + tab_view_bounds.width() / 2,
       tab_view_bounds.y() - 2);
 
   // Start by moving the point just above the content.
   ASSERT_TRUE(window->SimulateOSMouseMove(above_content_point));
 
   // Navigate to the test html page.
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
 
   const int timeout_ms = 5 * action_max_timeout_ms();
 
   // Wait for the onload() handler to complete so we can do the
   // next part of the test.
   ASSERT_TRUE(WaitUntilCookieValue(
-      tab.get(), test_url, "__state", timeout_ms,
-      "initial"));
+      tab.get(), test_url, "__state", timeout_ms, "initial"));
 
   // Move the cursor to the top-center of the content, which will trigger
   // a javascript onMouseOver event.
   ASSERT_TRUE(window->SimulateOSMouseMove(in_content_point));
 
   // Wait on the correct intermediate value of the cookie.
   ASSERT_TRUE(WaitUntilCookieValue(
-      tab.get(), test_url, "__state", timeout_ms,
-      "initial,entered"));
+      tab.get(), test_url, "__state", timeout_ms, "initial,entered"));
 
   // Move the cursor above the content again, which should trigger
   // a javascript onMouseOut event.
   ASSERT_TRUE(window->SimulateOSMouseMove(above_content_point));
 
   // Wait on the correct final value of the cookie.
   ASSERT_TRUE(WaitUntilCookieValue(
-      tab.get(), test_url, "__state", timeout_ms,
-      "initial,entered,left"));
+      tab.get(), test_url, "__state", timeout_ms, "initial,entered,left"));
 }
 
 }  // namespace