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

Side by Side Diff: chrome/browser/automation/url_request_slow_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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/automation/url_request_slow_http_job.h:r21668
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // A URLRequestMockHTTPJob class that inserts a time delay in processing. 5 // A URLRequestMockHTTPJob class that inserts a time delay in processing.
6 6
7 #ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_ 7 #ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_
8 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_ 8 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_
9 9
10 #include <string> 10 #include <string>
(...skipping 21 matching lines...) Expand all
32 void RealStart(); 32 void RealStart();
33 33
34 base::OneShotTimer<URLRequestSlowHTTPJob> delay_timer_; 34 base::OneShotTimer<URLRequestSlowHTTPJob> delay_timer_;
35 35
36 // This is the file path leading to the root of the directory to use as the 36 // This is the file path leading to the root of the directory to use as the
37 // root of the http server. 37 // root of the http server.
38 static std::wstring base_path_; 38 static std::wstring base_path_;
39 }; 39 };
40 40
41 # endif // CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_ 41 # endif // CHROME_BROWSER_AUTOMATION_URL_REQUEST_SLOW_HTTP_JOB_H_
OLDNEW
« no previous file with comments | « chrome/browser/automation/url_request_mock_http_job.cc ('k') | chrome/browser/automation/url_request_slow_http_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698