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

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

Issue 3983005: Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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
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/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/thread_restrictions.h"
11 #include "chrome/browser/browser_thread.h" 10 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/net/url_request_failed_dns_job.h" 11 #include "chrome/browser/net/url_request_failed_dns_job.h"
13 #include "chrome/browser/net/url_request_mock_http_job.h" 12 #include "chrome/browser/net/url_request_mock_http_job.h"
14 #include "chrome/browser/net/url_request_mock_link_doctor_job.h" 13 #include "chrome/browser/net/url_request_mock_link_doctor_job.h"
15 #include "chrome/browser/net/url_request_slow_download_job.h" 14 #include "chrome/browser/net/url_request_slow_download_job.h"
16 #include "chrome/browser/net/url_request_slow_http_job.h" 15 #include "chrome/browser/net/url_request_slow_http_job.h"
17 #include "chrome/common/chrome_paths.h" 16 #include "chrome/common/chrome_paths.h"
18 #include "net/url_request/url_request_filter.h" 17 #include "net/url_request/url_request_filter.h"
19 18
20 namespace chrome_browser_net { 19 namespace chrome_browser_net {
21 20
22 void SetUrlRequestMocksEnabled(bool enabled) { 21 void SetUrlRequestMocksEnabled(bool enabled) {
23 // Since this involves changing the URLRequest ProtocolFactory, we need to 22 // Since this involves changing the URLRequest ProtocolFactory, we need to
24 // run on the IO thread. 23 // run on the IO thread.
25 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 24 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
26 25
27 if (enabled) { 26 if (enabled) {
28 // We have to look around for our helper files, but we only use
29 // this from tests, so allow these IO operations to happen
30 // anywhere.
31 base::ThreadRestrictions::ScopedAllowIO allow_io;
32
33 URLRequestFilter::GetInstance()->ClearHandlers(); 27 URLRequestFilter::GetInstance()->ClearHandlers();
34 28
35 URLRequestFailedDnsJob::AddUrlHandler(); 29 URLRequestFailedDnsJob::AddUrlHandler();
36 URLRequestMockLinkDoctorJob::AddUrlHandler(); 30 URLRequestMockLinkDoctorJob::AddUrlHandler();
37 URLRequestSlowDownloadJob::AddUrlHandler(); 31 URLRequestSlowDownloadJob::AddUrlHandler();
38 32
39 FilePath root_http; 33 FilePath root_http;
40 PathService::Get(chrome::DIR_TEST_DATA, &root_http); 34 PathService::Get(chrome::DIR_TEST_DATA, &root_http);
41 URLRequestMockHTTPJob::AddUrlHandler(root_http); 35 URLRequestMockHTTPJob::AddUrlHandler(root_http);
42 URLRequestSlowHTTPJob::AddUrlHandler(root_http); 36 URLRequestSlowHTTPJob::AddUrlHandler(root_http);
43 } else { 37 } else {
44 // Revert to the default handlers. 38 // Revert to the default handlers.
45 URLRequestFilter::GetInstance()->ClearHandlers(); 39 URLRequestFilter::GetInstance()->ClearHandlers();
46 } 40 }
47 } 41 }
48 42
49 } // namespace chrome_browser_net 43 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/url_request_mock_http_job.cc ('k') | chrome/browser/printing/print_dialog_cloud_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698