Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 15 matching lines...) Expand all Loading... | |
| 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 | 34 // Temporary layering violation to allow existing users of a deprecated |
| 35 // interface. | 35 // interface. |
| 36 class ChildProcessSecurityPolicyTest; | 36 class ChildProcessSecurityPolicyTest; |
|
pauljensen
2014/06/05 16:36:54
I think these three lines can go too?
mmenke
2014/06/05 16:42:28
Done. Thanks for catching that.
| |
| 37 | 37 |
| 38 namespace base { | 38 namespace base { |
| 39 class Value; | 39 class Value; |
| 40 | 40 |
| 41 namespace debug { | 41 namespace debug { |
| 42 class StackTrace; | 42 class StackTrace; |
| 43 } // namespace debug | 43 } // namespace debug |
| 44 } // namespace base | 44 } // namespace base |
| 45 | 45 |
| 46 // Temporary layering violation to allow existing users of a deprecated | 46 // Temporary layering violation to allow existing users of a deprecated |
| 47 // interface. | 47 // interface. |
| 48 namespace content { | 48 namespace content { |
| 49 class AppCacheInterceptor; | 49 class AppCacheInterceptor; |
| 50 class AppCacheURLRequestJobTest; | |
| 51 class AppCacheRequestHandlerTest; | |
| 52 class BlobURLRequestJobTest; | |
| 53 class FileSystemDirURLRequestJobTest; | |
| 54 class FileSystemURLRequestJobTest; | |
| 55 class FileWriterDelegateTest; | |
| 56 class ResourceDispatcherHostTest; | |
| 57 } | 50 } |
| 58 | 51 |
| 59 namespace net { | 52 namespace net { |
| 60 | 53 |
| 61 class CookieOptions; | 54 class CookieOptions; |
| 62 class HostPortPair; | 55 class HostPortPair; |
| 63 class IOBuffer; | 56 class IOBuffer; |
| 64 struct LoadTimingInfo; | 57 struct LoadTimingInfo; |
| 65 class SSLCertRequestInfo; | 58 class SSLCertRequestInfo; |
| 66 class SSLInfo; | 59 class SSLInfo; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 virtual URLRequestJob* MaybeInterceptResponse( | 146 virtual URLRequestJob* MaybeInterceptResponse( |
| 154 URLRequest* request, NetworkDelegate* network_delegate); | 147 URLRequest* request, NetworkDelegate* network_delegate); |
| 155 }; | 148 }; |
| 156 | 149 |
| 157 // Deprecated interfaces in net::URLRequest. They have been moved to | 150 // Deprecated interfaces in net::URLRequest. They have been moved to |
| 158 // URLRequest's private section to prevent new uses. Existing uses are | 151 // URLRequest's private section to prevent new uses. Existing uses are |
| 159 // explicitly friended here and should be removed over time. | 152 // explicitly friended here and should be removed over time. |
| 160 class NET_EXPORT Deprecated { | 153 class NET_EXPORT Deprecated { |
| 161 private: | 154 private: |
| 162 // TODO(willchan): Kill off these friend declarations. | 155 // TODO(willchan): Kill off these friend declarations. |
| 163 friend class ::ChildProcessSecurityPolicyTest; | 156 friend class ::ChildProcessSecurityPolicyTest; |
|
pauljensen
2014/06/05 16:36:54
I think this line can go too?
mmenke
2014/06/05 16:42:28
Done.
| |
| 164 friend class TestInterceptor; | 157 friend class TestInterceptor; |
| 165 friend class URLRequestFilter; | 158 friend class URLRequestFilter; |
| 166 friend class content::AppCacheInterceptor; | 159 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 | 160 |
| 175 // Use URLRequestJobFactory::ProtocolHandler instead. | 161 // Use URLRequestJobFactory::ProtocolHandler instead. |
| 176 static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme, | 162 static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme, |
| 177 ProtocolFactory* factory); | 163 ProtocolFactory* factory); |
| 178 | 164 |
| 179 // TODO(pauljensen): Remove this when AppCacheInterceptor is a | 165 // TODO(pauljensen): Remove this when AppCacheInterceptor is a |
| 180 // ProtocolHandler, see crbug.com/161547. | 166 // ProtocolHandler, see crbug.com/161547. |
| 181 static void RegisterRequestInterceptor(Interceptor* interceptor); | 167 static void RegisterRequestInterceptor(Interceptor* interceptor); |
| 182 static void UnregisterRequestInterceptor(Interceptor* interceptor); | 168 static void UnregisterRequestInterceptor(Interceptor* interceptor); |
| 183 | 169 |
| (...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 913 | 899 |
| 914 // The cookie store to be used for this request. | 900 // The cookie store to be used for this request. |
| 915 scoped_refptr<CookieStore> cookie_store_; | 901 scoped_refptr<CookieStore> cookie_store_; |
| 916 | 902 |
| 917 DISALLOW_COPY_AND_ASSIGN(URLRequest); | 903 DISALLOW_COPY_AND_ASSIGN(URLRequest); |
| 918 }; | 904 }; |
| 919 | 905 |
| 920 } // namespace net | 906 } // namespace net |
| 921 | 907 |
| 922 #endif // NET_URL_REQUEST_URL_REQUEST_H_ | 908 #endif // NET_URL_REQUEST_URL_REQUEST_H_ |
| OLD | NEW |