| 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 #include "content/browser/loader/resource_loader.h" | 5 #include "content/browser/loader/resource_loader.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); | 143 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); |
| 144 DCHECK(!request->ssl_info().connection_status); | 144 DCHECK(!request->ssl_info().connection_status); |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace | 148 } // namespace |
| 149 | 149 |
| 150 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, | 150 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, |
| 151 std::unique_ptr<ResourceHandler> handler, | 151 std::unique_ptr<ResourceHandler> handler, |
| 152 CertStore* cert_store, | 152 CertStore* cert_store, |
| 153 std::unique_ptr<mojom::URLLoader> mojo_loader, |
| 154 mojom::URLLoaderClientPtr mojo_loader_client, |
| 153 ResourceLoaderDelegate* delegate) | 155 ResourceLoaderDelegate* delegate) |
| 154 : deferred_stage_(DEFERRED_NONE), | 156 : deferred_stage_(DEFERRED_NONE), |
| 155 request_(std::move(request)), | 157 request_(std::move(request)), |
| 156 handler_(std::move(handler)), | 158 handler_(std::move(handler)), |
| 157 delegate_(delegate), | 159 delegate_(delegate), |
| 160 mojo_loader_(std::move(mojo_loader)), |
| 161 mojo_loader_client_(std::move(mojo_loader_client)), |
| 158 is_transferring_(false), | 162 is_transferring_(false), |
| 159 times_cancelled_before_request_start_(0), | 163 times_cancelled_before_request_start_(0), |
| 160 started_request_(false), | 164 started_request_(false), |
| 161 times_cancelled_after_request_start_(0), | 165 times_cancelled_after_request_start_(0), |
| 162 cert_store_(cert_store), | 166 cert_store_(cert_store), |
| 163 weak_ptr_factory_(this) { | 167 weak_ptr_factory_(this) { |
| 164 request_->set_delegate(this); | 168 request_->set_delegate(this); |
| 165 handler_->SetController(this); | 169 handler_->SetController(this); |
| 166 } | 170 } |
| 167 | 171 |
| 172 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, |
| 173 std::unique_ptr<ResourceHandler> handler, |
| 174 CertStore* cert_store, |
| 175 ResourceLoaderDelegate* delegate) |
| 176 : ResourceLoader(std::move(request), |
| 177 std::move(handler), |
| 178 cert_store, |
| 179 nullptr, |
| 180 nullptr, |
| 181 delegate) {} |
| 182 |
| 168 ResourceLoader::~ResourceLoader() { | 183 ResourceLoader::~ResourceLoader() { |
| 169 if (login_delegate_.get()) | 184 if (login_delegate_.get()) |
| 170 login_delegate_->OnRequestCancelled(); | 185 login_delegate_->OnRequestCancelled(); |
| 171 ssl_client_auth_handler_.reset(); | 186 ssl_client_auth_handler_.reset(); |
| 172 | 187 |
| 173 // Run ResourceHandler destructor before we tear-down the rest of our state | 188 // Run ResourceHandler destructor before we tear-down the rest of our state |
| 174 // as the ResourceHandler may want to inspect the URLRequest and other state. | 189 // as the ResourceHandler may want to inspect the URLRequest and other state. |
| 175 handler_.reset(); | 190 handler_.reset(); |
| 176 } | 191 } |
| 177 | 192 |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 } | 773 } |
| 759 | 774 |
| 760 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 775 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
| 761 } else if (request_->response_info().unused_since_prefetch) { | 776 } else if (request_->response_info().unused_since_prefetch) { |
| 762 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); | 777 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); |
| 763 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); | 778 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); |
| 764 } | 779 } |
| 765 } | 780 } |
| 766 | 781 |
| 767 } // namespace content | 782 } // namespace content |
| OLD | NEW |