Make AutomationProxyTest.NavigateToURLWithTimeout* tests not-flaky.

chrome/browser/automation/url_request_mock_http_job.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 "chrome/browser/automation/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_filter.h"
 
 static const char kMockHostname[] = "mock.http";
 static const wchar_t kMockHeaderFileSuffix[] = L".mock-http-headers";
 
 std::wstring URLRequestMockHTTPJob::base_path_ = L"";
 
 /* static */
 URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
                                               const std::string& scheme) {
-  std::wstring file_url(L"file:///");
-  file_url += base_path_;
-  const std::string& url = request->url().spec();
-  // Fix up the url to be the file url we're loading from disk.
-  std::string host_prefix("http://");
-  host_prefix.append(kMockHostname);
-  size_t host_prefix_len = host_prefix.length();
-  if (url.compare(0, host_prefix_len, host_prefix.data(),
-                  host_prefix_len) == 0) {
-    file_url += UTF8ToWide(url.substr(host_prefix_len));
-  }
-
-  // Convert the file:/// URL to a path on disk.
-  FilePath file_path;
-  net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
-  return new URLRequestMockHTTPJob(request, file_path);
+  return new URLRequestMockHTTPJob(request,
+                                   GetOnDiskPath(base_path_, request, scheme));
 }
 
 /* static */
 void URLRequestMockHTTPJob::AddUITestUrls(const std::wstring& base_path) {
   base_path_ = base_path;
 
   // Add kMockHostname to URLRequestFilter.
   URLRequestFilter* filter = URLRequestFilter::GetInstance();
   filter->AddHostnameHandler("http", kMockHostname,
                              URLRequestMockHTTPJob::Factory);
 }
 
 /* static */
 GURL URLRequestMockHTTPJob::GetMockUrl(const std::wstring& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
   url.append(WideToUTF8(path));
   return GURL(url);
 }
 
+/* static */
+FilePath URLRequestMockHTTPJob::GetOnDiskPath(const std::wstring& base_path,
+                                              URLRequest* request,
+                                              const std::string& scheme) {
+  std::wstring file_url(L"file:///");
+  file_url += base_path;
+  const std::string& url = request->url().spec();
+  // Fix up the url to be the file url we're loading from disk.
+  std::string host_prefix("http://");
+  host_prefix.append(kMockHostname);
+  size_t host_prefix_len = host_prefix.length();
+  if (url.compare(0, host_prefix_len, host_prefix.data(),
+                  host_prefix_len) == 0) {
+    file_url += UTF8ToWide(url.substr(host_prefix_len));
+  }
+
+  // Convert the file:/// URL to a path on disk.
+  FilePath file_path;
+  net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
+  return file_path;
+}
+
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request,
                                              const FilePath& file_path)
     : URLRequestFileJob(request, file_path) { }
 
 // Public virtual version.
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
   // Forward to private const version.
   GetResponseInfoConst(info);
 }
 
@@ skipping 14 matching lines @@
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
   return info.headers && info.headers->GetMimeType(mime_type);
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }