[GTTF] Miscellanous UI tests cleanups:

chrome/worker/worker_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/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 15 matching lines @@
     GURL url = GetTestUrl(L"workers", test_case);
     ASSERT_TRUE(tab->NavigateToURL(url));
 
     std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
         kTestCompleteCookie, action_max_timeout_ms());
     ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   }
 
   void RunIncognitoTest(const std::wstring& test_case) {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+    ASSERT_TRUE(browser.get());
+
     // Open an Incognito window.
-    int window_count;
     ASSERT_TRUE(browser->RunCommand(IDC_NEW_INCOGNITO_WINDOW));
     scoped_refptr<BrowserProxy> incognito(automation()->GetBrowserWindow(1));
-    scoped_refptr<TabProxy> tab(incognito->GetTab(0));
+    ASSERT_TRUE(incognito.get());
+    int window_count;
     ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
     ASSERT_EQ(2, window_count);
 
+    scoped_refptr<TabProxy> tab(incognito->GetTab(0));
+    ASSERT_TRUE(tab.get());
+
     GURL url = GetTestUrl(L"workers", test_case);
     ASSERT_TRUE(tab->NavigateToURL(url));
 
     std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
         kTestCompleteCookie, action_max_timeout_ms());
 
     // Close the incognito window
     ASSERT_TRUE(incognito->RunCommand(IDC_CLOSE_WINDOW));
     ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
     ASSERT_EQ(1, window_count);
@@ skipping 94 matching lines @@
 
 const wchar_t kDocRoot[] = L"chrome/test/data/workers";
 
 // http://crbug.com/36630 termination issues, disabled on all platforms.
 // http://crbug.com/33344 - NavigateAndWaitForAuth times out on the Windows
 // build bots.
 // Make sure that auth dialog is displayed from worker context.
 TEST_F(WorkerTest, DISABLED_WorkerHttpAuth) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
+  ASSERT_TRUE(NULL != server.get());
 
-  ASSERT_TRUE(NULL != server.get());
   scoped_refptr<TabProxy> tab(GetActiveTab());
+  ASSERT_TRUE(tab.get());
+
   GURL url = server->TestServerPage("files/worker_auth.html");
   EXPECT_TRUE(NavigateAndWaitForAuth(tab, url));
 }
 
 // http://crbug.com/36630 termination issues, disabled on all platforms.
 // http://crbug.com/33344 - NavigateAndWaitForAuth times out on the Windows
 // build bots.
 // Make sure that auth dialog is displayed from shared worker context.
 TEST_F(WorkerTest, DISABLED_SharedWorkerHttpAuth) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
+
   scoped_refptr<TabProxy> tab(GetActiveTab());
-  EXPECT_EQ(1, GetTabCount());
+  ASSERT_TRUE(tab.get());
+
   GURL url = server->TestServerPage("files/shared_worker_auth.html");
   EXPECT_TRUE(NavigateAndWaitForAuth(tab, url));
   // TODO(atwilson): Add support to automation framework to test for auth
   // dialogs displayed by non-navigating tabs.
 }
 
 TEST_F(WorkerTest, StressJSExecution) {
   RunWorkerFastLayoutTest("stress-js-execution.html");
 }
 
@@ skipping 297 matching lines @@
 }
 
 // http://crbug.com/30307, disabled on Linux
 // This has been flaky on Windows since r39931. http://crbug.com/36800
 // http://crbug.com/36630. Termination issues, disabled on all platforms.
 TEST_F(WorkerTest, DISABLED_LimitPerPage) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   GURL url = GetTestUrl(L"workers", L"many_workers.html");
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1));
 
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-  ASSERT_TRUE(tab->NavigateToURL(url));
-
+  NavigateToURL(url);
   ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab));
 }
 
 // Doesn't crash, but on all platforms, it sometimes fails.
 // http://crbug.com/28445. Made FLAKY
 // http://crbug.com/36630. Termination issues, disabled on all platforms.
 TEST_F(WorkerTest, DISABLED_LimitTotal) {
 #if !defined(OS_LINUX)
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   int total_workers = WorkerService::kMaxWorkersWhenSeparate;
@@ skipping 57 matching lines @@
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(url));
   ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab));
 
   // Create same set of workers in new tab (leaves one worker queued from this
   // tab).
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(window.get());
   ASSERT_TRUE(window->AppendTab(url));
   ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab));
 
   // Now shutdown one of the shared workers - this will fire both queued
   // workers, but only one instance should be started
   GURL url2 = GetTestUrl(L"workers", L"shutdown_shared_worker.html?id=0");
   ASSERT_TRUE(window->AppendTab(url2));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
       kTestCompleteCookie, action_max_timeout_ms());
@@ skipping 10 matching lines @@
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(url));
   ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab));
   // First window has hit its limit. Now launch second window which creates
   // the same worker that was queued in the first window, to ensure it gets
   // connected to the first window too.
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(window.get());
   GURL url2 = GetTestUrl(L"workers", L"single_shared_worker.html");
   url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab));
   ASSERT_TRUE(window->AppendTab(url2));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
       kTestCompleteCookie, action_max_timeout_ms());
   ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1));
 }