Merge 21668 - Make AutomationProxyTest.NavigateToURLWithTimeout* tests notfla...

chrome/browser/automation/url_request_mock_http_job.h

 // 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.
 //
 // A URLRequestJob class that pulls the content and http headers from disk.
 
 #ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_MOCK_HTTP_JOB_H__
 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_MOCK_HTTP_JOB_H__
 
 #include <string>
@@ skipping 10 matching lines @@
   virtual void GetResponseInfo(net::HttpResponseInfo* info);
 
   static URLRequest::ProtocolFactory Factory;
 
   // For UI tests: adds the testing URLs to the URLRequestFilter.
   static void AddUITestUrls(const std::wstring& base_path);
 
   // Given the path to a file relative to base_path_, construct a mock URL.
   static GURL GetMockUrl(const std::wstring& path);
 
+ protected:
+  static FilePath GetOnDiskPath(const std::wstring& base_path,
+                                URLRequest* request,
+                                const std::string& scheme);
+
  private:
   void GetResponseInfoConst(net::HttpResponseInfo* info) const;
 
   // This is the file path leading to the root of the directory to use as the
   // root of the http server.
   static std::wstring base_path_;
 };
 
 # endif  // CHROME_BROWSER_AUTOMATION_URL_REQUEST_MOCK_HTTP_JOB_H__