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

Unified Diff: chrome/browser/chromeos/policy/upload_job_unittest.cc

Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/upload_job_unittest.cc
diff --git a/chrome/browser/chromeos/policy/upload_job_unittest.cc b/chrome/browser/chromeos/policy/upload_job_unittest.cc
index f98efaede9a29a7854001d922341b96caadf6daf..85f88cb6f9abe6e6c698ad5fcbc74c47fe709ea7 100644
--- a/chrome/browser/chromeos/policy/upload_job_unittest.cc
+++ b/chrome/browser/chromeos/policy/upload_job_unittest.cc
@@ -173,7 +173,7 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate {
const GURL GetServerURL() const { return test_server_.GetURL(kUploadPath); }
void SetExpectedError(scoped_ptr<UploadJob::ErrorCode> expected_error) {
- expected_error_ = expected_error.Pass();
+ expected_error_ = std::move(expected_error);
}
// testing::Test:
@@ -192,20 +192,21 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate {
protected:
scoped_ptr<UploadJob> PrepareUploadJob(scoped_ptr<
UploadJobImpl::MimeBoundaryGenerator> mime_boundary_generator) {
- scoped_ptr<UploadJob> upload_job(new UploadJobImpl(
- GetServerURL(), kRobotAccountId, &oauth2_service_,
- request_context_getter_.get(), this, mime_boundary_generator.Pass()));
+ scoped_ptr<UploadJob> upload_job(
+ new UploadJobImpl(GetServerURL(), kRobotAccountId, &oauth2_service_,
+ request_context_getter_.get(), this,
+ std::move(mime_boundary_generator)));
std::map<std::string, std::string> header_entries;
header_entries.insert(std::make_pair(kCustomField1, "CUSTOM1"));
scoped_ptr<std::string> data(new std::string(kTestPayload1));
upload_job->AddDataSegment("Name1", "file1.ext", header_entries,
- data.Pass());
+ std::move(data));
header_entries.insert(std::make_pair(kCustomField2, "CUSTOM2"));
scoped_ptr<std::string> data2(new std::string(kTestPayload2));
- upload_job->AddDataSegment("Name2", "", header_entries, data2.Pass());
- return upload_job.Pass();
+ upload_job->AddDataSegment("Name2", "", header_entries, std::move(data2));
+ return upload_job;
}
content::TestBrowserThreadBundle test_browser_thread_bundle_;
@@ -238,14 +239,14 @@ class UploadFlowTest : public UploadJobTestBase {
const size_t pos = authorization_header.find(" ");
if (pos == std::string::npos) {
response->set_code(net::HTTP_UNAUTHORIZED);
- return response.Pass();
+ return std::move(response);
}
const std::string token = authorization_header.substr(pos + 1);
response->set_code(oauth2_service_.IsTokenValid(token)
? net::HTTP_OK
: net::HTTP_UNAUTHORIZED);
- return response.Pass();
+ return std::move(response);
}
};
@@ -307,7 +308,7 @@ class UploadRequestTest : public UploadJobTestBase {
new net::test_server::BasicHttpResponse);
response->set_code(net::HTTP_OK);
EXPECT_EQ(expected_content_, request.content);
- return response.Pass();
+ return std::move(response);
}
void SetExpectedRequestContent(const std::string& expected_content) {

Powered by Google App Engine
This is Rietveld 408576698