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

Side by Side Diff: content/browser/loader/resource_loader.h

Issue 596873002: Remove SSLClientAuthHandler's RDH dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
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 CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ 5 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ 6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "content/browser/loader/resource_handler.h" 11 #include "content/browser/loader/resource_handler.h"
12 #include "content/browser/ssl/ssl_error_handler.h" 12 #include "content/browser/ssl/ssl_error_handler.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "content/public/browser/resource_controller.h" 14 #include "content/public/browser/resource_controller.h"
15 #include "content/public/common/signed_certificate_timestamp_id_and_status.h" 15 #include "content/public/common/signed_certificate_timestamp_id_and_status.h"
16 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
17 17
18 namespace net {
19 class X509Certificate;
20 }
21
18 namespace content { 22 namespace content {
19 class ResourceDispatcherHostLoginDelegate; 23 class ResourceDispatcherHostLoginDelegate;
20 class ResourceLoaderDelegate; 24 class ResourceLoaderDelegate;
21 class ResourceRequestInfoImpl; 25 class ResourceRequestInfoImpl;
22 class SSLClientAuthHandler; 26 class SSLClientAuthHandler;
23 27
24 // This class is responsible for driving the URLRequest (i.e., calling Start, 28 // This class is responsible for driving the URLRequest (i.e., calling Start,
25 // Read, and servicing events). It has a ResourceHandler, which is typically a 29 // Read, and servicing events). It has a ResourceHandler, which is typically a
26 // chain of ResourceHandlers, and is the ResourceController for its handler. 30 // chain of ResourceHandlers, and is the ResourceController for its handler.
27 class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate, 31 class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
(...skipping 11 matching lines...) Expand all
39 void ReportUploadProgress(); 43 void ReportUploadProgress();
40 44
41 bool is_transferring() const { return is_transferring_; } 45 bool is_transferring() const { return is_transferring_; }
42 void MarkAsTransferring(); 46 void MarkAsTransferring();
43 void CompleteTransfer(); 47 void CompleteTransfer();
44 48
45 net::URLRequest* request() { return request_.get(); } 49 net::URLRequest* request() { return request_.get(); }
46 ResourceRequestInfoImpl* GetRequestInfo(); 50 ResourceRequestInfoImpl* GetRequestInfo();
47 51
48 void ClearLoginDelegate(); 52 void ClearLoginDelegate();
49 void ClearSSLClientAuthHandler();
50 53
51 // IPC message handlers: 54 // IPC message handlers:
52 void OnUploadProgressACK(); 55 void OnUploadProgressACK();
53 56
54 private: 57 private:
55 FRIEND_TEST_ALL_PREFIXES(ResourceLoaderTest, ClientCertStoreLookup); 58 FRIEND_TEST_ALL_PREFIXES(ResourceLoaderTest, ClientCertStoreLookup);
56 FRIEND_TEST_ALL_PREFIXES(ResourceLoaderTest, ClientCertStoreNull); 59 FRIEND_TEST_ALL_PREFIXES(ResourceLoaderTest, ClientCertStoreNull);
57 60
58 // net::URLRequest::Delegate implementation: 61 // net::URLRequest::Delegate implementation:
59 virtual void OnReceivedRedirect(net::URLRequest* request, 62 virtual void OnReceivedRedirect(net::URLRequest* request,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 SignedCertificateTimestampIDStatusList* sct_ids); 98 SignedCertificateTimestampIDStatusList* sct_ids);
96 void CompleteResponseStarted(); 99 void CompleteResponseStarted();
97 void StartReading(bool is_continuation); 100 void StartReading(bool is_continuation);
98 void ResumeReading(); 101 void ResumeReading();
99 void ReadMore(int* bytes_read); 102 void ReadMore(int* bytes_read);
100 // Passes a read result to the handler. 103 // Passes a read result to the handler.
101 void CompleteRead(int bytes_read); 104 void CompleteRead(int bytes_read);
102 void ResponseCompleted(); 105 void ResponseCompleted();
103 void CallDidFinishLoading(); 106 void CallDidFinishLoading();
104 void RecordHistograms(); 107 void RecordHistograms();
108 void ContinueWithCertificate(net::X509Certificate* cert);
105 109
106 bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; } 110 bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
107 111
108 // Used for categorizing loading of prefetches for reporting in histograms. 112 // Used for categorizing loading of prefetches for reporting in histograms.
109 // NOTE: This enumeration is used in histograms, so please do not add entries 113 // NOTE: This enumeration is used in histograms, so please do not add entries
110 // in the middle. 114 // in the middle.
111 enum PrefetchStatus { 115 enum PrefetchStatus {
112 STATUS_UNDEFINED, 116 STATUS_UNDEFINED,
113 STATUS_SUCCESS_FROM_CACHE, 117 STATUS_SUCCESS_FROM_CACHE,
114 STATUS_SUCCESS_FROM_NETWORK, 118 STATUS_SUCCESS_FROM_NETWORK,
(...skipping 10 matching lines...) Expand all
125 DEFERRED_RESPONSE_COMPLETE, 129 DEFERRED_RESPONSE_COMPLETE,
126 DEFERRED_FINISH 130 DEFERRED_FINISH
127 }; 131 };
128 DeferredStage deferred_stage_; 132 DeferredStage deferred_stage_;
129 133
130 scoped_ptr<net::URLRequest> request_; 134 scoped_ptr<net::URLRequest> request_;
131 scoped_ptr<ResourceHandler> handler_; 135 scoped_ptr<ResourceHandler> handler_;
132 ResourceLoaderDelegate* delegate_; 136 ResourceLoaderDelegate* delegate_;
133 137
134 scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_; 138 scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
135 scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_; 139 scoped_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
136 140
137 uint64 last_upload_position_; 141 uint64 last_upload_position_;
138 bool waiting_for_upload_progress_ack_; 142 bool waiting_for_upload_progress_ack_;
139 base::TimeTicks last_upload_ticks_; 143 base::TimeTicks last_upload_ticks_;
140 base::TimeTicks read_deferral_start_time_; 144 base::TimeTicks read_deferral_start_time_;
141 145
142 // Indicates that we are in a state of being transferred to a new downstream 146 // Indicates that we are in a state of being transferred to a new downstream
143 // consumer. We are waiting for a notification to complete the transfer, at 147 // consumer. We are waiting for a notification to complete the transfer, at
144 // which point we'll receive a new ResourceHandler. 148 // which point we'll receive a new ResourceHandler.
145 bool is_transferring_; 149 bool is_transferring_;
146 150
147 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_; 151 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
148 152
149 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); 153 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
150 }; 154 };
151 155
152 } // namespace content 156 } // namespace content
153 157
154 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ 158 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
OLDNEW
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/loader/resource_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698