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

Side by Side Diff: chrome/browser/devtools/device/webrtc/devtools_bridge_client_browsertest.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/device/webrtc/devtools_bridge_client_browserte st.h" 5 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_client_browserte st.h"
6 6
7 #include <utility>
8
7 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_client.h" 9 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_client.h"
8 #include "chrome/browser/local_discovery/gcd_api_flow.h" 10 #include "chrome/browser/local_discovery/gcd_api_flow.h"
9 #include "chrome/browser/signin/account_tracker_service_factory.h" 11 #include "chrome/browser/signin/account_tracker_service_factory.h"
10 #include "chrome/browser/signin/fake_signin_manager_builder.h" 12 #include "chrome/browser/signin/fake_signin_manager_builder.h"
11 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
12 #include "components/signin/core/browser/account_tracker_service.h" 14 #include "components/signin/core/browser/account_tracker_service.h"
13 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 15 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
14 #include "content/public/browser/web_ui_message_handler.h" 16 #include "content/public/browser/web_ui_message_handler.h"
15 17
16 namespace { 18 namespace {
17 19
18 const char kGaiaId[] = "stub-user@example.com"; 20 const char kGaiaId[] = "stub-user@example.com";
19 const char kUsername[] = "stub-user@example.com"; 21 const char kUsername[] = "stub-user@example.com";
20 22
21 } // namespace 23 } // namespace
22 24
23 class DevToolsBridgeClientBrowserTest::GCDApiFlowMock 25 class DevToolsBridgeClientBrowserTest::GCDApiFlowMock
24 : public local_discovery::GCDApiFlow { 26 : public local_discovery::GCDApiFlow {
25 public: 27 public:
26 explicit GCDApiFlowMock(DevToolsBridgeClientBrowserTest* test) 28 explicit GCDApiFlowMock(DevToolsBridgeClientBrowserTest* test)
27 : test_(test), id_(++test->last_flow_id_) { 29 : test_(test), id_(++test->last_flow_id_) {
28 test_->flows_[id_] = this; 30 test_->flows_[id_] = this;
29 } 31 }
30 32
31 ~GCDApiFlowMock() override { test_->flows_.erase(id_); } 33 ~GCDApiFlowMock() override { test_->flows_.erase(id_); }
32 34
33 // Passes request's data to the JS test. Result will be passed back 35 // Passes request's data to the JS test. Result will be passed back
34 // in MessageHandler::Response. 36 // in MessageHandler::Response.
35 void Start(scoped_ptr<Request> request) override { 37 void Start(scoped_ptr<Request> request) override {
36 request_ = request.Pass(); 38 request_ = std::move(request);
37 39
38 std::string type; 40 std::string type;
39 std::string data; 41 std::string data;
40 request_->GetUploadData(&type, &data); 42 request_->GetUploadData(&type, &data);
41 43
42 ScopedVector<const base::Value> params; 44 ScopedVector<const base::Value> params;
43 params.push_back(new base::FundamentalValue(id_)); 45 params.push_back(new base::FundamentalValue(id_));
44 params.push_back(new base::StringValue(request_->GetURL().spec())); 46 params.push_back(new base::StringValue(request_->GetURL().spec()));
45 params.push_back(new base::StringValue(data)); 47 params.push_back(new base::StringValue(data));
46 48
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 fake_signin_manager_.reset(); 176 fake_signin_manager_.reset();
175 WebUIBrowserTest::TearDownOnMainThread(); 177 WebUIBrowserTest::TearDownOnMainThread();
176 } 178 }
177 179
178 content::WebUIMessageHandler* 180 content::WebUIMessageHandler*
179 DevToolsBridgeClientBrowserTest::GetMockMessageHandler() { 181 DevToolsBridgeClientBrowserTest::GetMockMessageHandler() {
180 if (!handler_.get()) 182 if (!handler_.get())
181 handler_.reset(new MessageHandler(this)); 183 handler_.reset(new MessageHandler(this));
182 return handler_.get(); 184 return handler_.get();
183 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698