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

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

Issue 1970693002: Use mojo for Chrome Loading, Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 #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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); 131 DCHECK_EQ(request->ssl_info().key_exchange_info, 0);
132 DCHECK(!request->ssl_info().connection_status); 132 DCHECK(!request->ssl_info().connection_status);
133 } 133 }
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 137
138 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, 138 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
139 std::unique_ptr<ResourceHandler> handler, 139 std::unique_ptr<ResourceHandler> handler,
140 CertStore* cert_store, 140 CertStore* cert_store,
141 std::unique_ptr<mojom::URLLoader> mojo_loader,
142 mojom::URLLoaderClientPtr mojo_loader_client,
141 ResourceLoaderDelegate* delegate) 143 ResourceLoaderDelegate* delegate)
142 : deferred_stage_(DEFERRED_NONE), 144 : deferred_stage_(DEFERRED_NONE),
143 request_(std::move(request)), 145 request_(std::move(request)),
144 handler_(std::move(handler)), 146 handler_(std::move(handler)),
145 delegate_(delegate), 147 delegate_(delegate),
148 mojo_loader_(std::move(mojo_loader)),
149 mojo_loader_client_(std::move(mojo_loader_client)),
146 is_transferring_(false), 150 is_transferring_(false),
147 times_cancelled_before_request_start_(0), 151 times_cancelled_before_request_start_(0),
148 started_request_(false), 152 started_request_(false),
149 times_cancelled_after_request_start_(0), 153 times_cancelled_after_request_start_(0),
150 cert_store_(cert_store), 154 cert_store_(cert_store),
151 weak_ptr_factory_(this) { 155 weak_ptr_factory_(this) {
152 request_->set_delegate(this); 156 request_->set_delegate(this);
153 handler_->SetController(this); 157 handler_->SetController(this);
154 } 158 }
155 159
160 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
161 std::unique_ptr<ResourceHandler> handler,
162 CertStore* cert_store,
163 ResourceLoaderDelegate* delegate)
164 : ResourceLoader(std::move(request),
165 std::move(handler),
166 cert_store,
167 nullptr,
168 nullptr,
169 delegate) {}
170
156 ResourceLoader::~ResourceLoader() { 171 ResourceLoader::~ResourceLoader() {
157 if (login_delegate_.get()) 172 if (login_delegate_.get())
158 login_delegate_->OnRequestCancelled(); 173 login_delegate_->OnRequestCancelled();
159 ssl_client_auth_handler_.reset(); 174 ssl_client_auth_handler_.reset();
160 175
161 // Run ResourceHandler destructor before we tear-down the rest of our state 176 // Run ResourceHandler destructor before we tear-down the rest of our state
162 // as the ResourceHandler may want to inspect the URLRequest and other state. 177 // as the ResourceHandler may want to inspect the URLRequest and other state.
163 handler_.reset(); 178 handler_.reset();
164 } 179 }
165 180
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 } 761 }
747 762
748 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 763 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
749 } else if (request_->response_info().unused_since_prefetch) { 764 } else if (request_->response_info().unused_since_prefetch) {
750 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); 765 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time();
751 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); 766 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time);
752 } 767 }
753 } 768 }
754 769
755 } // namespace content 770 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698