[GTTF] Various ui tests cleanups:

chrome/browser/dom_ui/new_tab_ui_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 "chrome/test/ui/ui_test.h"
 
 #include "base/file_path.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/pref_service.h"
@@ skipping 15 matching lines @@
         UITest::DEFAULT_THEME));
   }
 };
 
 TEST_F(NewTabUITest, NTPHasThumbnails) {
   // Switch to the "new tab" tab, which should be any new tab after the
   // first (the first is about:blank).
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
-  int tab_count = -1;
-  ASSERT_TRUE(window->GetTabCount(&tab_count));
-  ASSERT_EQ(1, tab_count);
-
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
-  ASSERT_TRUE(window->GetTabCount(&tab_count));
-  ASSERT_EQ(2, tab_count);
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   // Blank thumbnails on the NTP have the class 'filler' applied to the div.
   // If all the thumbnails load, there should be no div's with 'filler'.
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
   int filler_thumbnails_count = -1;
-  const int kWaitDuration = 100;
   int wait_time = action_max_timeout_ms();
   while (wait_time > 0) {
     ASSERT_TRUE(tab->ExecuteAndExtractInt(L"",
         L"window.domAutomationController.send("
         L"document.getElementsByClassName('filler').length)",
         &filler_thumbnails_count));
     if (filler_thumbnails_count == 0)
       break;
-    PlatformThread::Sleep(kWaitDuration);
-    wait_time -= kWaitDuration;
+    PlatformThread::Sleep(sleep_timeout_ms());
+    wait_time -= sleep_timeout_ms();
   }
   EXPECT_EQ(0, filler_thumbnails_count);
 }
 
 TEST_F(NewTabUITest, ChromeInternalLoadsNTP) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
-  int tab_count = -1;
-  ASSERT_TRUE(window->GetTabCount(&tab_count));
-  ASSERT_EQ(1, tab_count);
-
   // Go to the "new tab page" using its old url, rather than chrome://newtab.
   scoped_refptr<TabProxy> tab = window->GetTab(0);
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURLAsync(GURL("chrome-internal:")));
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   // Ensure there are some thumbnails loaded in the page.
   int thumbnails_count = -1;
   ASSERT_TRUE(tab->ExecuteAndExtractInt(L"",
@@ skipping 25 matching lines @@
   ASSERT_FALSE(migrated);
 }
 
 TEST_F(NewTabUITest, HomePageLink) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   ASSERT_TRUE(
       browser->SetBooleanPreference(prefs::kHomePageIsNewTabPage, false));
 
-  int tab_count = -1;
-  ASSERT_TRUE(browser->GetTabCount(&tab_count));
-  ASSERT_EQ(1, tab_count);
-
   // Bring up a new tab page.
   ASSERT_TRUE(browser->RunCommand(IDC_NEW_TAB));
-  ASSERT_TRUE(browser->GetTabCount(&tab_count));
-  ASSERT_EQ(2, tab_count);
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   scoped_refptr<TabProxy> tab = browser->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
   // TODO(arv): Extract common patterns for doing js testing.
 
   // Fire click. Because tip service is turned off for testing, we first
   // force the "make this my home page" tip to appear.
@@ skipping 37 matching lines @@
     L"})()"
     L")",
     &has_class));
   ASSERT_TRUE(has_class);
 
   bool is_home_page;
   ASSERT_TRUE(browser->GetBooleanPreference(prefs::kHomePageIsNewTabPage,
               &is_home_page));
   ASSERT_TRUE(is_home_page);
 }