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

Side by Side Diff: chrome/browser/automation/url_request_slow_http_job.cc

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
« no previous file with comments | « chrome/browser/automation/url_request_slow_http_job.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/automation/url_request_slow_http_job.cc: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 #include "chrome/browser/automation/url_request_slow_http_job.h" 5 #include "chrome/browser/automation/url_request_slow_http_job.h"
6 6
7 #include "base/platform_thread.h" 7 #include "base/platform_thread.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "net/url_request/url_request_filter.h" 10 #include "net/url_request/url_request_filter.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 : URLRequestMockHTTPJob(request, file_path) { } 49 : URLRequestMockHTTPJob(request, file_path) { }
50 50
51 void URLRequestSlowHTTPJob::Start() { 51 void URLRequestSlowHTTPJob::Start() {
52 delay_timer_.Start(TimeDelta::FromMilliseconds(kDelayMs), this, 52 delay_timer_.Start(TimeDelta::FromMilliseconds(kDelayMs), this,
53 &URLRequestSlowHTTPJob::RealStart); 53 &URLRequestSlowHTTPJob::RealStart);
54 } 54 }
55 55
56 void URLRequestSlowHTTPJob::RealStart() { 56 void URLRequestSlowHTTPJob::RealStart() {
57 URLRequestMockHTTPJob::Start(); 57 URLRequestMockHTTPJob::Start();
58 } 58 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/url_request_slow_http_job.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698