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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 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/threading/thread_restrictions.h"
11 #include "chrome/browser/browser_thread.h" 11 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/net/url_request_failed_dns_job.h" 12 #include "chrome/browser/net/url_request_failed_dns_job.h"
13 #include "chrome/browser/net/url_request_mock_http_job.h" 13 #include "chrome/browser/net/url_request_mock_http_job.h"
14 #include "chrome/browser/net/url_request_mock_link_doctor_job.h" 14 #include "chrome/browser/net/url_request_mock_link_doctor_job.h"
15 #include "chrome/browser/net/url_request_slow_download_job.h" 15 #include "chrome/browser/net/url_request_slow_download_job.h"
16 #include "chrome/browser/net/url_request_slow_http_job.h" 16 #include "chrome/browser/net/url_request_slow_http_job.h"
17 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
18 #include "net/url_request/url_request_filter.h" 18 #include "net/url_request/url_request_filter.h"
19 19
20 namespace chrome_browser_net { 20 namespace chrome_browser_net {
(...skipping 19 matching lines...) Expand all
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 net::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
« no previous file with comments | « chrome/browser/net/url_request_mock_http_job.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698