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

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

Issue 6037013: net: Add namespace net to URLRequestFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 12 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) 2010 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" 10 #include "base/thread_restrictions.h"
11 #include "chrome/browser/browser_thread.h" 11 #include "chrome/browser/browser_thread.h"
(...skipping 11 matching lines...) Expand all
23 // Since this involves changing the net::URLRequest ProtocolFactory, we need 23 // Since this involves changing the net::URLRequest ProtocolFactory, we need
24 // to run on the IO thread. 24 // to run on the IO thread.
25 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 25 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
26 26
27 if (enabled) { 27 if (enabled) {
28 // We have to look around for our helper files, but we only use 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 29 // this from tests, so allow these IO operations to happen
30 // anywhere. 30 // anywhere.
31 base::ThreadRestrictions::ScopedAllowIO allow_io; 31 base::ThreadRestrictions::ScopedAllowIO allow_io;
32 32
33 URLRequestFilter::GetInstance()->ClearHandlers(); 33 net::URLRequestFilter::GetInstance()->ClearHandlers();
34 34
35 URLRequestFailedDnsJob::AddUrlHandler(); 35 URLRequestFailedDnsJob::AddUrlHandler();
36 URLRequestMockLinkDoctorJob::AddUrlHandler(); 36 URLRequestMockLinkDoctorJob::AddUrlHandler();
37 URLRequestSlowDownloadJob::AddUrlHandler(); 37 URLRequestSlowDownloadJob::AddUrlHandler();
38 38
39 FilePath root_http; 39 FilePath root_http;
40 PathService::Get(chrome::DIR_TEST_DATA, &root_http); 40 PathService::Get(chrome::DIR_TEST_DATA, &root_http);
41 URLRequestMockHTTPJob::AddUrlHandler(root_http); 41 URLRequestMockHTTPJob::AddUrlHandler(root_http);
42 URLRequestSlowHTTPJob::AddUrlHandler(root_http); 42 URLRequestSlowHTTPJob::AddUrlHandler(root_http);
43 } else { 43 } else {
44 // Revert to the default handlers. 44 // Revert to the default handlers.
45 URLRequestFilter::GetInstance()->ClearHandlers(); 45 net::URLRequestFilter::GetInstance()->ClearHandlers();
46 } 46 }
47 } 47 }
48 48
49 } // namespace chrome_browser_net 49 } // namespace chrome_browser_net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698