Make AutomationProxyTest.NavigateToURLWithTimeout* tests not-flaky.

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/automation/url_request_slow_http_job.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
@@ skipping 255 matching lines @@
   filename = filename.AppendASCII("title2.html");
 
   bool is_timeout;
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
                                 5000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+
+  // Use timeout high enough to allow the browser to create a url request job.
+  const int kLowTimeoutMs = 250;
+  ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
+  tab->NavigateToURLWithTimeout(
+      URLRequestSlowHTTPJob::GetMockUrl(filename.ToWStringHack()),
+      kLowTimeoutMs, &is_timeout);
+  ASSERT_TRUE(is_timeout);
 }
 
 TEST_F(AutomationProxyTest, NavigateToURLWithTimeout2) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   FilePath filename1(test_data_directory_);
   filename1 = filename1.AppendASCII("title1.html");
 
   bool is_timeout;
-  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename1),
-                                1, &is_timeout);
+
+  // Use timeout high enough to allow the browser to create a url request job.
+  const int kLowTimeoutMs = 250;
+  ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
+  tab->NavigateToURLWithTimeout(
+      URLRequestSlowHTTPJob::GetMockUrl(filename1.ToWStringHack()),
+      kLowTimeoutMs, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
   FilePath filename2(test_data_directory_);
   filename2 = filename2.AppendASCII("title1.html");
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename2),
                                 5000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 }
 
 TEST_F(AutomationProxyTest, GoBackForward) {
@@ skipping 774 matching lines @@
 
   // Allow some time for the popup to show up and close.
   PlatformThread::Sleep(2000);
 
   std::wstring expected(L"string");
   std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
   std::wstring actual;
   ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
   ASSERT_EQ(expected, actual);
 }