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

Side by Side Diff: chrome/browser/net/url_request_mock_util.cc

Issue 9704023: Replace URLRequestFailedDnsJob with URLRequestFailedJob (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix weak ptr factory usage Created 8 years, 9 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/errorpage_browsertest.cc ('k') | chrome/test/data/iframe_dns_error.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/net/url_request_mock_util.h" 5 #include "chrome/browser/net/url_request_mock_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
11 #include "chrome/browser/net/url_request_mock_link_doctor_job.h" 11 #include "chrome/browser/net/url_request_mock_link_doctor_job.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/test/net/url_request_failed_dns_job.h" 14 #include "content/test/net/url_request_failed_job.h"
15 #include "content/test/net/url_request_mock_http_job.h" 15 #include "content/test/net/url_request_mock_http_job.h"
16 #include "content/test/net/url_request_slow_download_job.h" 16 #include "content/test/net/url_request_slow_download_job.h"
17 #include "content/test/net/url_request_slow_http_job.h" 17 #include "content/test/net/url_request_slow_http_job.h"
18 #include "net/url_request/url_request_filter.h" 18 #include "net/url_request/url_request_filter.h"
19 19
20 using content::BrowserThread; 20 using content::BrowserThread;
21 21
22 namespace chrome_browser_net { 22 namespace chrome_browser_net {
23 23
24 void SetUrlRequestMocksEnabled(bool enabled) { 24 void SetUrlRequestMocksEnabled(bool enabled) {
25 // Since this involves changing the net::URLRequest ProtocolFactory, we need 25 // Since this involves changing the net::URLRequest ProtocolFactory, we need
26 // to run on the IO thread. 26 // to run on the IO thread.
27 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 27 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
28 28
29 if (enabled) { 29 if (enabled) {
30 // We have to look around for our helper files, but we only use 30 // We have to look around for our helper files, but we only use
31 // this from tests, so allow these IO operations to happen 31 // this from tests, so allow these IO operations to happen
32 // anywhere. 32 // anywhere.
33 base::ThreadRestrictions::ScopedAllowIO allow_io; 33 base::ThreadRestrictions::ScopedAllowIO allow_io;
34 34
35 net::URLRequestFilter::GetInstance()->ClearHandlers(); 35 net::URLRequestFilter::GetInstance()->ClearHandlers();
36 36
37 URLRequestFailedDnsJob::AddUrlHandler(); 37 URLRequestFailedJob::AddUrlHandler();
38 URLRequestMockLinkDoctorJob::AddUrlHandler(); 38 URLRequestMockLinkDoctorJob::AddUrlHandler();
39 URLRequestSlowDownloadJob::AddUrlHandler(); 39 URLRequestSlowDownloadJob::AddUrlHandler();
40 40
41 FilePath root_http; 41 FilePath root_http;
42 PathService::Get(chrome::DIR_TEST_DATA, &root_http); 42 PathService::Get(chrome::DIR_TEST_DATA, &root_http);
43 URLRequestMockHTTPJob::AddUrlHandler(root_http); 43 URLRequestMockHTTPJob::AddUrlHandler(root_http);
44 URLRequestSlowHTTPJob::AddUrlHandler(root_http); 44 URLRequestSlowHTTPJob::AddUrlHandler(root_http);
45 } else { 45 } else {
46 // Revert to the default handlers. 46 // Revert to the default handlers.
47 net::URLRequestFilter::GetInstance()->ClearHandlers(); 47 net::URLRequestFilter::GetInstance()->ClearHandlers();
48 } 48 }
49 } 49 }
50 50
51 } // namespace chrome_browser_net 51 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/errorpage_browsertest.cc ('k') | chrome/test/data/iframe_dns_error.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698