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

Side by Side Diff: chrome/browser/devtools/devtools_network_controller_unittest.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_controller.h"
6
5 #include <stdint.h> 7 #include <stdint.h>
6
7 #include <string> 8 #include <string>
9 #include <utility>
8 10
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 15 #include "base/run_loop.h"
14 #include "chrome/browser/devtools/devtools_network_conditions.h" 16 #include "chrome/browser/devtools/devtools_network_conditions.h"
15 #include "chrome/browser/devtools/devtools_network_controller.h"
16 #include "chrome/browser/devtools/devtools_network_interceptor.h" 17 #include "chrome/browser/devtools/devtools_network_interceptor.h"
17 #include "chrome/browser/devtools/devtools_network_transaction.h" 18 #include "chrome/browser/devtools/devtools_network_transaction.h"
18 #include "chrome/browser/devtools/devtools_network_upload_data_stream.h" 19 #include "chrome/browser/devtools/devtools_network_upload_data_stream.h"
19 #include "net/base/chunked_upload_data_stream.h" 20 #include "net/base/chunked_upload_data_stream.h"
20 #include "net/http/http_transaction_test_util.h" 21 #include "net/http/http_transaction_test_util.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 #include "url/gurl.h" 23 #include "url/gurl.h"
23 24
24 namespace test { 25 namespace test {
25 26
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 mock_transaction_.test_mode = TEST_MODE_SYNC_NET_START; 60 mock_transaction_.test_mode = TEST_MODE_SYNC_NET_START;
60 mock_transaction_.url = "http://dot.com"; 61 mock_transaction_.url = "http://dot.com";
61 mock_transaction_.request_headers = 62 mock_transaction_.request_headers =
62 "X-DevTools-Emulate-Network-Conditions-Client-Id: 42\r\n"; 63 "X-DevTools-Emulate-Network-Conditions-Client-Id: 42\r\n";
63 AddMockTransaction(&mock_transaction_); 64 AddMockTransaction(&mock_transaction_);
64 65
65 scoped_ptr<net::HttpTransaction> network_transaction; 66 scoped_ptr<net::HttpTransaction> network_transaction;
66 network_layer_.CreateTransaction( 67 network_layer_.CreateTransaction(
67 net::DEFAULT_PRIORITY, &network_transaction); 68 net::DEFAULT_PRIORITY, &network_transaction);
68 transaction_.reset(new DevToolsNetworkTransaction( 69 transaction_.reset(new DevToolsNetworkTransaction(
69 &controller_, network_transaction.Pass())); 70 &controller_, std::move(network_transaction)));
70 } 71 }
71 72
72 void SetNetworkState(bool offline, double download, double upload) { 73 void SetNetworkState(bool offline, double download, double upload) {
73 scoped_ptr<DevToolsNetworkConditions> conditions( 74 scoped_ptr<DevToolsNetworkConditions> conditions(
74 new DevToolsNetworkConditions(offline, 0, download, upload)); 75 new DevToolsNetworkConditions(offline, 0, download, upload));
75 controller_.SetNetworkState(kClientId, conditions.Pass()); 76 controller_.SetNetworkState(kClientId, std::move(conditions));
76 } 77 }
77 78
78 void SetNetworkState(const std::string& id, bool offline) { 79 void SetNetworkState(const std::string& id, bool offline) {
79 scoped_ptr<DevToolsNetworkConditions> conditions( 80 scoped_ptr<DevToolsNetworkConditions> conditions(
80 new DevToolsNetworkConditions(offline)); 81 new DevToolsNetworkConditions(offline));
81 controller_.SetNetworkState(id, conditions.Pass()); 82 controller_.SetNetworkState(id, std::move(conditions));
82 } 83 }
83 84
84 int Start(bool with_upload) { 85 int Start(bool with_upload) {
85 request_.reset(new MockHttpRequest(mock_transaction_)); 86 request_.reset(new MockHttpRequest(mock_transaction_));
86 87
87 if (with_upload) { 88 if (with_upload) {
88 upload_data_stream_.reset( 89 upload_data_stream_.reset(
89 new net::ChunkedUploadDataStream(kUploadIdentifier)); 90 new net::ChunkedUploadDataStream(kUploadIdentifier));
90 upload_data_stream_->AppendData( 91 upload_data_stream_->AppendData(
91 kUploadData, arraysize(kUploadData), true); 92 kUploadData, arraysize(kUploadData), true);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 318
318 rv = helper.ReadUploadData(); 319 rv = helper.ReadUploadData();
319 EXPECT_EQ(rv, net::ERR_IO_PENDING); 320 EXPECT_EQ(rv, net::ERR_IO_PENDING);
320 EXPECT_EQ(callback->run_count(), 1); 321 EXPECT_EQ(callback->run_count(), 1);
321 base::RunLoop().RunUntilIdle(); 322 base::RunLoop().RunUntilIdle();
322 EXPECT_EQ(callback->run_count(), 2); 323 EXPECT_EQ(callback->run_count(), 2);
323 EXPECT_EQ(callback->value(), static_cast<int>(arraysize(kUploadData))); 324 EXPECT_EQ(callback->value(), static_cast<int>(arraysize(kUploadData)));
324 } 325 }
325 326
326 } // namespace test 327 } // namespace test
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698