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

Side by Side Diff: chrome/browser/devtools/devtools_network_transaction.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/devtools/devtools_network_transaction.h" 5 #include "chrome/browser/devtools/devtools_network_transaction.h"
6 6
7 #include <utility>
8
7 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
8 #include "chrome/browser/devtools/devtools_network_controller.h" 10 #include "chrome/browser/devtools/devtools_network_controller.h"
9 #include "chrome/browser/devtools/devtools_network_interceptor.h" 11 #include "chrome/browser/devtools/devtools_network_interceptor.h"
10 #include "chrome/browser/devtools/devtools_network_upload_data_stream.h" 12 #include "chrome/browser/devtools/devtools_network_upload_data_stream.h"
11 #include "net/base/load_timing_info.h" 13 #include "net/base/load_timing_info.h"
12 #include "net/base/net_errors.h" 14 #include "net/base/net_errors.h"
13 #include "net/base/upload_progress.h" 15 #include "net/base/upload_progress.h"
14 #include "net/http/http_network_transaction.h" 16 #include "net/http/http_network_transaction.h"
15 #include "net/http/http_request_info.h" 17 #include "net/http/http_request_info.h"
16 #include "net/socket/connection_attempts.h" 18 #include "net/socket/connection_attempts.h"
17 19
18 // Keep in sync with kDevToolsEmulateNetworkConditionsClientId defined in 20 // Keep in sync with kDevToolsEmulateNetworkConditionsClientId defined in
19 // InspectorResourceAgent.cpp. 21 // InspectorResourceAgent.cpp.
20 const char 22 const char
21 DevToolsNetworkTransaction::kDevToolsEmulateNetworkConditionsClientId[] = 23 DevToolsNetworkTransaction::kDevToolsEmulateNetworkConditionsClientId[] =
22 "X-DevTools-Emulate-Network-Conditions-Client-Id"; 24 "X-DevTools-Emulate-Network-Conditions-Client-Id";
23 25
24 DevToolsNetworkTransaction::DevToolsNetworkTransaction( 26 DevToolsNetworkTransaction::DevToolsNetworkTransaction(
25 DevToolsNetworkController* controller, 27 DevToolsNetworkController* controller,
26 scoped_ptr<net::HttpTransaction> network_transaction) 28 scoped_ptr<net::HttpTransaction> network_transaction)
27 : throttled_byte_count_(0), 29 : throttled_byte_count_(0),
28 controller_(controller), 30 controller_(controller),
29 network_transaction_(network_transaction.Pass()), 31 network_transaction_(std::move(network_transaction)),
30 request_(nullptr), 32 request_(nullptr),
31 failed_(false) { 33 failed_(false) {
32 DCHECK(controller); 34 DCHECK(controller);
33 } 35 }
34 36
35 DevToolsNetworkTransaction::~DevToolsNetworkTransaction() { 37 DevToolsNetworkTransaction::~DevToolsNetworkTransaction() {
36 if (interceptor_ && !throttle_callback_.is_null()) 38 if (interceptor_ && !throttle_callback_.is_null())
37 interceptor_->StopThrottle(throttle_callback_); 39 interceptor_->StopThrottle(throttle_callback_);
38 } 40 }
39 41
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 if (CheckFailed()) 297 if (CheckFailed())
296 return net::ERR_INTERNET_DISCONNECTED; 298 return net::ERR_INTERNET_DISCONNECTED;
297 return network_transaction_->ResumeNetworkStart(); 299 return network_transaction_->ResumeNetworkStart();
298 } 300 }
299 301
300 void 302 void
301 DevToolsNetworkTransaction::GetConnectionAttempts(net::ConnectionAttempts* out) 303 DevToolsNetworkTransaction::GetConnectionAttempts(net::ConnectionAttempts* out)
302 const { 304 const {
303 network_transaction_->GetConnectionAttempts(out); 305 network_transaction_->GetConnectionAttempts(out);
304 } 306 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698