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

Side by Side Diff: net/url_request/url_request.h

Issue 311263011: Remove ProtocolFactory use from appcache_url_request_job_unittest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Response to comments Created 6 years, 6 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 | « content/browser/appcache/appcache_url_request_job_unittest.cc ('k') | no next file » | 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) 2012 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 #ifndef NET_URL_REQUEST_URL_REQUEST_H_ 5 #ifndef NET_URL_REQUEST_URL_REQUEST_H_
6 #define NET_URL_REQUEST_URL_REQUEST_H_ 6 #define NET_URL_REQUEST_URL_REQUEST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "net/base/network_delegate.h" 24 #include "net/base/network_delegate.h"
25 #include "net/base/request_priority.h" 25 #include "net/base/request_priority.h"
26 #include "net/base/upload_progress.h" 26 #include "net/base/upload_progress.h"
27 #include "net/cookies/canonical_cookie.h" 27 #include "net/cookies/canonical_cookie.h"
28 #include "net/cookies/cookie_store.h" 28 #include "net/cookies/cookie_store.h"
29 #include "net/http/http_request_headers.h" 29 #include "net/http/http_request_headers.h"
30 #include "net/http/http_response_info.h" 30 #include "net/http/http_response_info.h"
31 #include "net/url_request/url_request_status.h" 31 #include "net/url_request/url_request_status.h"
32 #include "url/gurl.h" 32 #include "url/gurl.h"
33 33
34 // Temporary layering violation to allow existing users of a deprecated
35 // interface.
36 class ChildProcessSecurityPolicyTest;
37
38 namespace base { 34 namespace base {
39 class Value; 35 class Value;
40 36
41 namespace debug { 37 namespace debug {
42 class StackTrace; 38 class StackTrace;
43 } // namespace debug 39 } // namespace debug
44 } // namespace base 40 } // namespace base
45 41
46 // Temporary layering violation to allow existing users of a deprecated 42 // Temporary layering violation to allow existing users of a deprecated
47 // interface. 43 // interface.
48 namespace content { 44 namespace content {
49 class AppCacheInterceptor; 45 class AppCacheInterceptor;
50 class AppCacheURLRequestJobTest;
51 class AppCacheRequestHandlerTest;
52 class BlobURLRequestJobTest;
53 class FileSystemDirURLRequestJobTest;
54 class FileSystemURLRequestJobTest;
55 class FileWriterDelegateTest;
56 class ResourceDispatcherHostTest;
57 } 46 }
58 47
59 namespace net { 48 namespace net {
60 49
61 class CookieOptions; 50 class CookieOptions;
62 class HostPortPair; 51 class HostPortPair;
63 class IOBuffer; 52 class IOBuffer;
64 struct LoadTimingInfo; 53 struct LoadTimingInfo;
65 class SSLCertRequestInfo; 54 class SSLCertRequestInfo;
66 class SSLInfo; 55 class SSLInfo;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 virtual URLRequestJob* MaybeInterceptResponse( 142 virtual URLRequestJob* MaybeInterceptResponse(
154 URLRequest* request, NetworkDelegate* network_delegate); 143 URLRequest* request, NetworkDelegate* network_delegate);
155 }; 144 };
156 145
157 // Deprecated interfaces in net::URLRequest. They have been moved to 146 // Deprecated interfaces in net::URLRequest. They have been moved to
158 // URLRequest's private section to prevent new uses. Existing uses are 147 // URLRequest's private section to prevent new uses. Existing uses are
159 // explicitly friended here and should be removed over time. 148 // explicitly friended here and should be removed over time.
160 class NET_EXPORT Deprecated { 149 class NET_EXPORT Deprecated {
161 private: 150 private:
162 // TODO(willchan): Kill off these friend declarations. 151 // TODO(willchan): Kill off these friend declarations.
163 friend class ::ChildProcessSecurityPolicyTest;
164 friend class TestInterceptor; 152 friend class TestInterceptor;
165 friend class URLRequestFilter; 153 friend class URLRequestFilter;
166 friend class content::AppCacheInterceptor; 154 friend class content::AppCacheInterceptor;
167 friend class content::AppCacheRequestHandlerTest;
168 friend class content::AppCacheURLRequestJobTest;
169 friend class content::BlobURLRequestJobTest;
170 friend class content::FileSystemDirURLRequestJobTest;
171 friend class content::FileSystemURLRequestJobTest;
172 friend class content::FileWriterDelegateTest;
173 friend class content::ResourceDispatcherHostTest;
174 155
175 // Use URLRequestJobFactory::ProtocolHandler instead. 156 // Use URLRequestJobFactory::ProtocolHandler instead.
176 static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme, 157 static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme,
177 ProtocolFactory* factory); 158 ProtocolFactory* factory);
178 159
179 // TODO(pauljensen): Remove this when AppCacheInterceptor is a 160 // TODO(pauljensen): Remove this when AppCacheInterceptor is a
180 // ProtocolHandler, see crbug.com/161547. 161 // ProtocolHandler, see crbug.com/161547.
181 static void RegisterRequestInterceptor(Interceptor* interceptor); 162 static void RegisterRequestInterceptor(Interceptor* interceptor);
182 static void UnregisterRequestInterceptor(Interceptor* interceptor); 163 static void UnregisterRequestInterceptor(Interceptor* interceptor);
183 164
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 894
914 // The cookie store to be used for this request. 895 // The cookie store to be used for this request.
915 scoped_refptr<CookieStore> cookie_store_; 896 scoped_refptr<CookieStore> cookie_store_;
916 897
917 DISALLOW_COPY_AND_ASSIGN(URLRequest); 898 DISALLOW_COPY_AND_ASSIGN(URLRequest);
918 }; 899 };
919 900
920 } // namespace net 901 } // namespace net
921 902
922 #endif // NET_URL_REQUEST_URL_REQUEST_H_ 903 #endif // NET_URL_REQUEST_URL_REQUEST_H_
OLDNEW
« no previous file with comments | « content/browser/appcache/appcache_url_request_job_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698