Sprinkle some defensiveness into the UI tests so that they don't explode if t...

chrome/test/ui/ui_test.cc

 // Copyright (c) 2006-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 <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 528 matching lines @@
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
   if (!in_process_renderer_)
     AssertAppNotRunning(L"Unable to quit all browser processes.");
 }
 
 scoped_refptr<TabProxy> UITest::GetActiveTab(int window_index) {
   EXPECT_GE(window_index, 0);
-  int window_count;
-  // Use EXPECT rather than ASSERT here because ASSERT_* returns void.
+  int window_count = -1;
+  // We have to use EXPECT rather than ASSERT here because ASSERT_* only works
+  // in functions that return void.
   EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+  if (window_count == -1)
+    return NULL;
   EXPECT_GT(window_count, window_index);
   scoped_refptr<BrowserProxy> window_proxy(automation()->
       GetBrowserWindow(window_index));
   if (!window_proxy.get())
     return NULL;
 
   int active_tab_index = -1;
   EXPECT_TRUE(window_proxy->GetActiveTabIndex(&active_tab_index));
   if (active_tab_index == -1)
     return NULL;
@@ skipping 326 matching lines @@
   // a concatenation of the test name and the test id.  This allows
   // us to run multiple tests within a single webpage and test
   // that they all c
   std::string cookie_name = name;
   cookie_name.append(".");
   cookie_name.append(id);
   cookie_name.append(".");
   cookie_name.append(test_complete_cookie);
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
-
-  bool test_result = WaitUntilCookieValue(tab.get(), url,
-                                          cookie_name.c_str(),
-                                          kIntervalMilliSeconds, wait_time,
-                                          expected_cookie_value.c_str());
-  EXPECT_EQ(true, test_result);
+  EXPECT_TRUE(tab.get());
+  if (tab.get()) {
+    bool test_result = WaitUntilCookieValue(tab.get(), url,
+                                            cookie_name.c_str(),
+                                            kIntervalMilliSeconds, wait_time,
+                                            expected_cookie_value.c_str());
+    EXPECT_EQ(true, test_result);
+  }
 }
 
 void UITest::PrintResult(const std::string& measurement,
                          const std::string& modifier,
                          const std::string& trace,
                          size_t value,
                          const std::string& units,
                          bool important) {
   PrintResultsImpl(measurement, modifier, trace, UintToString(value),
                    "", "", units, important);
@@ skipping 47 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(sleep_timeout_ms() / 10);
   }
   return false;
 }