Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3802)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/automation/url_request_mock_http_job.h

Issue 165353: Merge 21668 - Make AutomationProxyTest.NavigateToURLWithTimeout* tests notfla... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/url_request_mock_http_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/url_request_mock_http_job.h
===================================================================
--- chrome/browser/automation/url_request_mock_http_job.h (revision 23129)
+++ chrome/browser/automation/url_request_mock_http_job.h (working copy)
@@ -28,6 +28,11 @@
// 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;
Property changes on: chrome\browser\automation\url_request_mock_http_job.h
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/browser/automation/url_request_mock_http_job.h:r69-2775
Merged /trunk/src/chrome/browser/automation/url_request_mock_http_job.h:r21668
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/url_request_mock_http_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698