diff options
author | dcheng <dcheng@chromium.org> | 2015-12-27 14:16:47 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-27 22:18:02 +0000 |
commit | 039a7365a80655d3ab1f37a450e6e81a54c7db6c (patch) | |
tree | c684336500af6c5da0ae6252f77ee6c2334ad0b0 /google_apis | |
parent | 64f325fc1d271609f83819102a8eba6d54d98d4b (diff) | |
download | chromium_src-039a7365a80655d3ab1f37a450e6e81a54c7db6c.zip chromium_src-039a7365a80655d3ab1f37a450e6e81a54c7db6c.tar.gz chromium_src-039a7365a80655d3ab1f37a450e6e81a54c7db6c.tar.bz2 |
Convert Pass()→std::move() in //google_apis
❆(੭ु ◜◡‾)੭ु⁾☃❆
BUG=557422
R=avi@chromium.org
TBR=rogerta@chromium.org
Review URL: https://codereview.chromium.org/1547233002
Cr-Commit-Position: refs/heads/master@{#366938}
Diffstat (limited to 'google_apis')
33 files changed, 164 insertions, 165 deletions
diff --git a/google_apis/drive/base_requests.cc b/google_apis/drive/base_requests.cc index a198138..3e5b0d1 100644 --- a/google_apis/drive/base_requests.cc +++ b/google_apis/drive/base_requests.cc @@ -5,6 +5,7 @@ #include "google_apis/drive/base_requests.h" #include <stddef.h> +#include <utility> #include "base/files/file_util.h" #include "base/json/json_reader.h" @@ -214,7 +215,7 @@ scoped_ptr<base::Value> ParseJson(const std::string& json) { LOG(WARNING) << "Error while parsing entry response: " << error_message << ", code: " << error_code << ", json:\n" << trimmed_json; } - return value.Pass(); + return value; } void GenerateMultipartBody(MultipartType multipart_type, @@ -742,7 +743,7 @@ void UploadRangeRequestBase::OnDataParsed(DriveApiErrorCode code, DCHECK(CalledOnValidThread()); DCHECK(code == HTTP_CREATED || code == HTTP_SUCCESS); - OnRangeRequestComplete(UploadRangeResponse(code, -1, -1), value.Pass()); + OnRangeRequestComplete(UploadRangeResponse(code, -1, -1), std::move(value)); OnProcessURLFetchResultsComplete(); } diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc index e5baf6c..aa12ab8 100644 --- a/google_apis/drive/base_requests_unittest.cc +++ b/google_apis/drive/base_requests_unittest.cc @@ -5,6 +5,7 @@ #include "google_apis/drive/base_requests.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -129,7 +130,7 @@ class BaseRequestsTest : public testing::Test { response->set_code(response_code_); response->set_content(response_body_); response->set_content_type("application/json"); - return response.Pass(); + return std::move(response); } base::MessageLoopForIO message_loop_; diff --git a/google_apis/drive/drive_api_parser.cc b/google_apis/drive/drive_api_parser.cc index ff08eb7..579f166 100644 --- a/google_apis/drive/drive_api_parser.cc +++ b/google_apis/drive/drive_api_parser.cc @@ -222,7 +222,7 @@ scoped_ptr<AboutResource> AboutResource::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid About resource JSON!"; return scoped_ptr<AboutResource>(); } - return resource.Pass(); + return resource; } // static @@ -277,7 +277,7 @@ scoped_ptr<DriveAppIcon> DriveAppIcon::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid DriveAppIcon JSON!"; return scoped_ptr<DriveAppIcon>(); } - return resource.Pass(); + return resource; } bool DriveAppIcon::Parse(const base::Value& value) { @@ -342,7 +342,7 @@ scoped_ptr<AppResource> AppResource::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid AppResource JSON!"; return scoped_ptr<AppResource>(); } - return resource.Pass(); + return resource; } bool AppResource::Parse(const base::Value& value) { @@ -376,7 +376,7 @@ scoped_ptr<AppList> AppList::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid AppList JSON!"; return scoped_ptr<AppList>(); } - return resource.Pass(); + return resource; } bool AppList::Parse(const base::Value& value) { @@ -413,7 +413,7 @@ ParentReference::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid ParentRefernce JSON!"; return scoped_ptr<ParentReference>(); } - return reference.Pass(); + return reference; } bool ParentReference::Parse(const base::Value& value) { @@ -485,7 +485,7 @@ scoped_ptr<FileResource> FileResource::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid FileResource JSON!"; return scoped_ptr<FileResource>(); } - return resource.Pass(); + return resource; } bool FileResource::IsDirectory() const { @@ -536,7 +536,7 @@ scoped_ptr<FileList> FileList::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid FileList JSON!"; return scoped_ptr<FileList>(); } - return resource.Pass(); + return resource; } bool FileList::Parse(const base::Value& value) { @@ -577,7 +577,7 @@ ChangeResource::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid ChangeResource JSON!"; return scoped_ptr<ChangeResource>(); } - return resource.Pass(); + return resource; } bool ChangeResource::Parse(const base::Value& value) { @@ -620,7 +620,7 @@ scoped_ptr<ChangeList> ChangeList::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid ChangeList JSON!"; return scoped_ptr<ChangeList>(); } - return resource.Pass(); + return resource; } bool ChangeList::Parse(const base::Value& value) { @@ -653,7 +653,7 @@ scoped_ptr<FileLabels> FileLabels::CreateFrom(const base::Value& value) { LOG(ERROR) << "Unable to create: Invalid FileLabels JSON!"; return scoped_ptr<FileLabels>(); } - return resource.Pass(); + return resource; } bool FileLabels::Parse(const base::Value& value) { @@ -694,7 +694,7 @@ scoped_ptr<ImageMediaMetadata> ImageMediaMetadata::CreateFrom( LOG(ERROR) << "Unable to create: Invalid ImageMediaMetadata JSON!"; return scoped_ptr<ImageMediaMetadata>(); } - return resource.Pass(); + return resource; } bool ImageMediaMetadata::Parse(const base::Value& value) { diff --git a/google_apis/drive/drive_api_parser.h b/google_apis/drive/drive_api_parser.h index 907b23b..b6734e5 100644 --- a/google_apis/drive/drive_api_parser.h +++ b/google_apis/drive/drive_api_parser.h @@ -6,8 +6,8 @@ #define GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_ #include <stdint.h> - #include <string> +#include <utility> #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" @@ -234,22 +234,22 @@ class AppResource { void set_removable(bool removable) { removable_ = removable; } void set_primary_mimetypes( ScopedVector<std::string> primary_mimetypes) { - primary_mimetypes_ = primary_mimetypes.Pass(); + primary_mimetypes_ = std::move(primary_mimetypes); } void set_secondary_mimetypes( ScopedVector<std::string> secondary_mimetypes) { - secondary_mimetypes_ = secondary_mimetypes.Pass(); + secondary_mimetypes_ = std::move(secondary_mimetypes); } void set_primary_file_extensions( ScopedVector<std::string> primary_file_extensions) { - primary_file_extensions_ = primary_file_extensions.Pass(); + primary_file_extensions_ = std::move(primary_file_extensions); } void set_secondary_file_extensions( ScopedVector<std::string> secondary_file_extensions) { - secondary_file_extensions_ = secondary_file_extensions.Pass(); + secondary_file_extensions_ = std::move(secondary_file_extensions); } void set_icons(ScopedVector<DriveAppIcon> icons) { - icons_ = icons.Pass(); + icons_ = std::move(icons); } void set_create_url(const GURL& url) { create_url_ = url; @@ -303,9 +303,7 @@ class AppList { void set_etag(const std::string& etag) { etag_ = etag; } - void set_items(ScopedVector<AppResource> items) { - items_ = items.Pass(); - } + void set_items(ScopedVector<AppResource> items) { items_ = std::move(items); } private: friend class DriveAPIParserTest; @@ -675,9 +673,7 @@ class ChangeResource { void set_deleted(bool deleted) { deleted_ = deleted; } - void set_file(scoped_ptr<FileResource> file) { - file_ = file.Pass(); - } + void set_file(scoped_ptr<FileResource> file) { file_ = std::move(file); } void set_modification_date(const base::Time& modification_date) { modification_date_ = modification_date; } diff --git a/google_apis/drive/drive_api_requests.cc b/google_apis/drive/drive_api_requests.cc index a14210e..e70a5f2 100644 --- a/google_apis/drive/drive_api_requests.cc +++ b/google_apis/drive/drive_api_requests.cc @@ -5,6 +5,7 @@ #include "google_apis/drive/drive_api_requests.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -77,7 +78,7 @@ void ParseFileResourceWithUploadRangeAndRun(const UploadRangeCallback& callback, } } - callback.Run(response, file_resource.Pass()); + callback.Run(response, std::move(file_resource)); } // Attaches |properties| to the |request_body| if |properties| is not empty. @@ -949,7 +950,7 @@ void ResumeUploadRequest::OnRangeRequestComplete( const UploadRangeResponse& response, scoped_ptr<base::Value> value) { DCHECK(CalledOnValidThread()); - ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass()); + ParseFileResourceWithUploadRangeAndRun(callback_, response, std::move(value)); } void ResumeUploadRequest::OnURLFetchUploadProgress( @@ -978,7 +979,7 @@ void GetUploadStatusRequest::OnRangeRequestComplete( const UploadRangeResponse& response, scoped_ptr<base::Value> value) { DCHECK(CalledOnValidThread()); - ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass()); + ParseFileResourceWithUploadRangeAndRun(callback_, response, std::move(value)); } //======================= MultipartUploadNewFileDelegate ======================= diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_api_requests.h index b34f970..2355576 100644 --- a/google_apis/drive/drive_api_requests.h +++ b/google_apis/drive/drive_api_requests.h @@ -6,8 +6,8 @@ #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/callback_forward.h" @@ -169,7 +169,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest { void OnDataParsed(DriveApiErrorCode error, scoped_ptr<DataType> value) { if (!value) error = DRIVE_PARSE_ERROR; - callback_.Run(error, value.Pass()); + callback_.Run(error, std::move(value)); OnProcessURLFetchResultsComplete(); } diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index 07feea4..0912d61 100644 --- a/google_apis/drive/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "google_apis/drive/drive_api_requests.h" + #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/files/file_path.h" @@ -16,7 +19,6 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "google_apis/drive/drive_api_parser.h" -#include "google_apis/drive/drive_api_requests.h" #include "google_apis/drive/drive_api_url_generator.h" #include "google_apis/drive/dummy_auth_service.h" #include "google_apis/drive/request_sender.h" @@ -244,7 +246,7 @@ class DriveApiRequestsTest : public testing::Test { scoped_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); http_response->set_code(net::HTTP_NO_CONTENT); - return http_response.Pass(); + return std::move(http_response); } // Reads the data file of |expected_data_file_path_| and returns its content @@ -282,7 +284,7 @@ class DriveApiRequestsTest : public testing::Test { new net::test_server::BasicHttpResponse); response->set_code(net::HTTP_NO_CONTENT); - return response.Pass(); + return std::move(response); } // Returns PRECONDITION_FAILED response for ETag mismatching with error JSON @@ -309,7 +311,7 @@ class DriveApiRequestsTest : public testing::Test { response->set_content_type("application/json"); } - return response.Pass(); + return std::move(response); } // Returns the response based on set expected upload url. @@ -344,7 +346,7 @@ class DriveApiRequestsTest : public testing::Test { response->AddCustomHeader( "Location", test_server_.base_url().Resolve(expected_upload_path_).spec()); - return response.Pass(); + return std::move(response); } scoped_ptr<net::test_server::HttpResponse> HandleResumeUploadRequest( @@ -394,7 +396,7 @@ class DriveApiRequestsTest : public testing::Test { "Range", "bytes=0-" + base::Int64ToString(received_bytes_ - 1)); } - return response.Pass(); + return std::move(response); } // All bytes are received. Return the "success" response with the file's @@ -408,7 +410,7 @@ class DriveApiRequestsTest : public testing::Test { response->set_code(net::HTTP_CREATED); } - return response.Pass(); + return std::move(response); } // Returns the response based on set expected content and its type. @@ -429,7 +431,7 @@ class DriveApiRequestsTest : public testing::Test { response->set_code(net::HTTP_OK); response->set_content_type(expected_content_type_); response->set_content(expected_content_); - return response.Pass(); + return std::move(response); } // Handles a request for downloading a file. @@ -451,7 +453,7 @@ class DriveApiRequestsTest : public testing::Test { response->set_code(net::HTTP_OK); response->set_content(id + id + id); response->set_content_type("text/plain"); - return response.Pass(); + return std::move(response); } scoped_ptr<net::test_server::HttpResponse> HandleBatchUploadRequest( @@ -489,7 +491,7 @@ class DriveApiRequestsTest : public testing::Test { " {\"reason\": \"userRateLimitExceeded\"}]}}\r\n" "\r\n" "--BOUNDARY--\r\n"); - return response.Pass(); + return std::move(response); } // These are for the current upload file status. diff --git a/google_apis/drive/files_list_request_runner.cc b/google_apis/drive/files_list_request_runner.cc index c3588b7..0de92ab 100644 --- a/google_apis/drive/files_list_request_runner.cc +++ b/google_apis/drive/files_list_request_runner.cc @@ -4,6 +4,8 @@ #include "google_apis/drive/files_list_request_runner.h" +#include <utility> + #include "base/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" @@ -73,7 +75,7 @@ void FilesListRequestRunner::OnCompleted(int max_results, return; } - callback.Run(error, entry.Pass()); + callback.Run(error, std::move(entry)); } void FilesListRequestRunner::SetRequestCompletedCallbackForTesting( diff --git a/google_apis/drive/request_util.cc b/google_apis/drive/request_util.cc index 1e55285..cfaaa7d 100644 --- a/google_apis/drive/request_util.cc +++ b/google_apis/drive/request_util.cc @@ -30,7 +30,7 @@ scoped_ptr<base::DictionaryValue> CreateParentValue( scoped_ptr<base::DictionaryValue> parent(new base::DictionaryValue); parent->SetString("kind", kParentLinkKind); parent->SetString("id", file_id); - return parent.Pass(); + return parent; } } // namespace util diff --git a/google_apis/drive/test_util.cc b/google_apis/drive/test_util.cc index 64216af..e79a24e 100644 --- a/google_apis/drive/test_util.cc +++ b/google_apis/drive/test_util.cc @@ -85,7 +85,7 @@ scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path) { scoped_ptr<base::Value> value = deserializer.Deserialize(NULL, &error); LOG_IF(WARNING, !value.get()) << "Failed to parse " << path.value() << ": " << error; - return value.Pass(); + return value; } // Returns a HttpResponse created from the given file path. @@ -105,7 +105,7 @@ scoped_ptr<net::test_server::BasicHttpResponse> CreateHttpResponseFromFile( http_response->set_code(net::HTTP_OK); http_response->set_content(content); http_response->set_content_type(content_type); - return http_response.Pass(); + return http_response; } scoped_ptr<net::test_server::HttpResponse> HandleDownloadFileRequest( diff --git a/google_apis/drive/test_util.h b/google_apis/drive/test_util.h index f959ad7..f3fbf8d 100644 --- a/google_apis/drive/test_util.h +++ b/google_apis/drive/test_util.h @@ -155,7 +155,7 @@ template<bool IsMovable, typename T> struct MoveHelper { static const T& Move(const T* in) { return *in; } }; template<typename T> struct MoveHelper<true, T> { - static T Move(T* in) { return in->Pass(); } + static T Move(T* in) { return std::move(*in); } }; // Helper to handle Chrome's move semantics correctly. diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index 9c7e483..82c366b 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc @@ -4,6 +4,7 @@ #include "google_apis/gaia/fake_gaia.h" +#include <utility> #include <vector> #include "base/base_paths.h" @@ -308,7 +309,7 @@ scoped_ptr<HttpResponse> FakeGaia::HandleRequest(const HttpRequest& request) { return scoped_ptr<HttpResponse>(); // Request not understood. } - return http_response.Pass(); + return std::move(http_response); } void FakeGaia::IssueOAuthToken(const std::string& auth_token, diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index c021623..618ecd4 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc @@ -4,6 +4,8 @@ #include "google_apis/gaia/gaia_oauth_client.h" +#include <utility> + #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -250,7 +252,7 @@ void GaiaOAuthClient::Core::HandleResponse( // Move ownership of the request fetcher into a local scoped_ptr which // will be nuked when we're done handling the request, unless we need // to retry, in which case ownership will be returned to request_. - scoped_ptr<net::URLFetcher> old_request = request_.Pass(); + scoped_ptr<net::URLFetcher> old_request = std::move(request_); DCHECK_EQ(source, old_request.get()); // HTTP_BAD_REQUEST means the arguments are invalid. HTTP_UNAUTHORIZED means @@ -283,7 +285,7 @@ void GaiaOAuthClient::Core::HandleResponse( // Retry limit reached. Give up. delegate_->OnNetworkError(source->GetResponseCode()); } else { - request_ = old_request.Pass(); + request_ = std::move(old_request); *should_retry_request = true; } return; @@ -308,12 +310,12 @@ void GaiaOAuthClient::Core::HandleResponse( } case USER_INFO: { - delegate_->OnGetUserInfoResponse(response_dict.Pass()); + delegate_->OnGetUserInfoResponse(std::move(response_dict)); break; } case TOKEN_INFO: { - delegate_->OnGetTokenInfoResponse(response_dict.Pass()); + delegate_->OnGetTokenInfoResponse(std::move(response_dict)); break; } diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc index 72885a4..ed20d13 100644 --- a/google_apis/gaia/oauth2_token_service.cc +++ b/google_apis/gaia/oauth2_token_service.cc @@ -5,7 +5,7 @@ #include "google_apis/gaia/oauth2_token_service.h" #include <stdint.h> - +#include <utility> #include <vector> #include "base/bind.h" @@ -507,7 +507,7 @@ OAuth2TokenService::StartRequestForClientWithContext( error, std::string(), base::Time())); - return request.Pass(); + return std::move(request); } RequestParameters request_parameters(client_id, @@ -529,7 +529,7 @@ OAuth2TokenService::StartRequestForClientWithContext( client_secret, scopes); } - return request.Pass(); + return std::move(request); } void OAuth2TokenService::FetchOAuth2Token(RequestImpl* request, diff --git a/google_apis/gaia/oauth2_token_service_request.cc b/google_apis/gaia/oauth2_token_service_request.cc index d843b04..819e3ca 100644 --- a/google_apis/gaia/oauth2_token_service_request.cc +++ b/google_apis/gaia/oauth2_token_service_request.cc @@ -220,7 +220,7 @@ RequestCore::~RequestCore() { void RequestCore::StartOnTokenServiceThread() { DCHECK(token_service_task_runner()->BelongsToCurrentThread()); - request_ = token_service()->StartRequest(account_id_, scopes_, this).Pass(); + request_ = token_service()->StartRequest(account_id_, scopes_, this); } void RequestCore::StopOnTokenServiceThread() { @@ -336,7 +336,7 @@ scoped_ptr<OAuth2TokenServiceRequest> OAuth2TokenServiceRequest::CreateAndStart( scoped_refptr<Core> core( new RequestCore(request.get(), provider, consumer, account_id, scopes)); request->StartWithCore(core); - return request.Pass(); + return request; } // static diff --git a/google_apis/gcm/base/mcs_message.cc b/google_apis/gcm/base/mcs_message.cc index c3d5151..8673426 100644 --- a/google_apis/gcm/base/mcs_message.cc +++ b/google_apis/gcm/base/mcs_message.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/base/mcs_message.h" +#include <utility> + #include "base/logging.h" #include "google_apis/gcm/base/mcs_util.h" @@ -15,13 +17,13 @@ MCSMessage::Core::Core(uint8_t tag, const google::protobuf::MessageLite& protobuf) { scoped_ptr<google::protobuf::MessageLite> owned_protobuf(protobuf.New()); owned_protobuf->CheckTypeAndMergeFrom(protobuf); - protobuf_ = owned_protobuf.Pass(); + protobuf_ = std::move(owned_protobuf); } MCSMessage::Core::Core( uint8_t tag, scoped_ptr<const google::protobuf::MessageLite> protobuf) { - protobuf_ = protobuf.Pass(); + protobuf_ = std::move(protobuf); } MCSMessage::Core::~Core() {} @@ -48,7 +50,7 @@ MCSMessage::MCSMessage(uint8_t tag, scoped_ptr<const google::protobuf::MessageLite> protobuf) : tag_(tag), size_(protobuf->ByteSize()), - core_(new Core(tag_, protobuf.Pass())) { + core_(new Core(tag_, std::move(protobuf))) { DCHECK_EQ(tag, GetMCSProtoTag(core_->Get())); } @@ -70,7 +72,7 @@ const google::protobuf::MessageLite& MCSMessage::GetProtobuf() const { scoped_ptr<google::protobuf::MessageLite> MCSMessage::CloneProtobuf() const { scoped_ptr<google::protobuf::MessageLite> clone(GetProtobuf().New()); clone->CheckTypeAndMergeFrom(GetProtobuf()); - return clone.Pass(); + return clone; } } // namespace gcm diff --git a/google_apis/gcm/base/mcs_message_unittest.cc b/google_apis/gcm/base/mcs_message_unittest.cc index c27a7c5..acbf334 100644 --- a/google_apis/gcm/base/mcs_message_unittest.cc +++ b/google_apis/gcm/base/mcs_message_unittest.cc @@ -5,6 +5,7 @@ #include "google_apis/gcm/base/mcs_message.h" #include <stdint.h> +#include <utility> #include "base/logging.h" #include "base/test/test_simple_task_runner.h" @@ -82,7 +83,7 @@ TEST_F(MCSMessageTest, InitPassOwnership) { BuildLoginRequest(kAndroidId, kSecret, "")); scoped_ptr<google::protobuf::MessageLite> login_copy( new mcs_proto::LoginRequest(*login_request)); - MCSMessage message(kLoginRequestTag, login_copy.Pass()); + MCSMessage message(kLoginRequestTag, std::move(login_copy)); EXPECT_FALSE(login_copy.get()); ASSERT_TRUE(message.IsValid()); EXPECT_EQ(kLoginRequestTag, message.tag()); diff --git a/google_apis/gcm/base/mcs_util.cc b/google_apis/gcm/base/mcs_util.cc index b35b23c..e79355c 100644 --- a/google_apis/gcm/base/mcs_util.cc +++ b/google_apis/gcm/base/mcs_util.cc @@ -81,7 +81,7 @@ scoped_ptr<mcs_proto::LoginRequest> BuildLoginRequest( login_request->add_setting(); login_request->mutable_setting(0)->set_name(kLoginSettingDefaultName); login_request->mutable_setting(0)->set_value(kLoginSettingDefaultValue); - return login_request.Pass(); + return login_request; } scoped_ptr<mcs_proto::IqStanza> BuildStreamAck() { @@ -90,7 +90,7 @@ scoped_ptr<mcs_proto::IqStanza> BuildStreamAck() { stream_ack_iq->set_id(""); stream_ack_iq->mutable_extension()->set_id(kStreamAck); stream_ack_iq->mutable_extension()->set_data(""); - return stream_ack_iq.Pass(); + return stream_ack_iq; } scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck( @@ -104,7 +104,7 @@ scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck( selective_ack.add_id(acked_ids[i]); selective_ack_iq->mutable_extension()->set_data( selective_ack.SerializeAsString()); - return selective_ack_iq.Pass(); + return selective_ack_iq; } // Utility method to build a google::protobuf::MessageLite object from a MCS diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc index 19f456c..43bac40 100644 --- a/google_apis/gcm/engine/connection_factory_impl.cc +++ b/google_apis/gcm/engine/connection_factory_impl.cc @@ -107,11 +107,10 @@ ConnectionHandler* ConnectionFactoryImpl::GetConnectionHandler() const { void ConnectionFactoryImpl::Connect() { if (!connection_handler_) { connection_handler_ = CreateConnectionHandler( - base::TimeDelta::FromMilliseconds(kReadTimeoutMs), - read_callback_, + base::TimeDelta::FromMilliseconds(kReadTimeoutMs), read_callback_, write_callback_, base::Bind(&ConnectionFactoryImpl::ConnectionHandlerCallback, - weak_ptr_factory_.GetWeakPtr())).Pass(); + weak_ptr_factory_.GetWeakPtr())); } if (connecting_ || waiting_for_backoff_) diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc index 7e8bc02..56ed855 100644 --- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc @@ -5,6 +5,7 @@ #include "google_apis/gcm/engine/connection_factory_impl.h" #include <cmath> +#include <utility> #include "base/message_loop/message_loop.h" #include "base/run_loop.h" @@ -201,7 +202,7 @@ TestConnectionFactoryImpl::CreateConnectionHandler( const ConnectionHandler::ProtoReceivedCallback& read_callback, const ConnectionHandler::ProtoSentCallback& write_callback, const ConnectionHandler::ConnectionChangedCallback& connection_callback) { - return scoped_handler_.Pass(); + return std::move(scoped_handler_); } base::TimeTicks TestConnectionFactoryImpl::NowTicks() { diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc index 0b7dce9..eb3e01e 100644 --- a/google_apis/gcm/engine/connection_handler_impl.cc +++ b/google_apis/gcm/engine/connection_handler_impl.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/connection_handler_impl.h" +#include <utility> + #include "base/location.h" #include "base/thread_task_runner_handle.h" #include "google/protobuf/io/coded_stream.h" @@ -388,7 +390,7 @@ void ConnectionHandlerImpl::OnGotMessageBytes() { FROM_HERE, base::Bind(&ConnectionHandlerImpl::GetNextMessage, weak_ptr_factory_.GetWeakPtr())); - read_callback_.Run(protobuf.Pass()); + read_callback_.Run(std::move(protobuf)); return; } @@ -470,7 +472,7 @@ void ConnectionHandlerImpl::OnGotMessageBytes() { connection_callback_.Run(net::OK); } } - read_callback_.Run(protobuf.Pass()); + read_callback_.Run(std::move(protobuf)); } void ConnectionHandlerImpl::OnTimeout() { diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc index 2aabba3..36b9ad3 100644 --- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc @@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/connection_handler_impl.h" #include <stdint.h> - #include <string> +#include <utility> #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -244,7 +244,7 @@ void GCMConnectionHandlerImplTest::Connect( void GCMConnectionHandlerImplTest::ReadContinuation( ScopedMessage* dst_proto, ScopedMessage new_proto) { - *dst_proto = new_proto.Pass(); + *dst_proto = std::move(new_proto); run_loop_->Quit(); } diff --git a/google_apis/gcm/engine/fake_connection_handler.cc b/google_apis/gcm/engine/fake_connection_handler.cc index 243c280..86c2561 100644 --- a/google_apis/gcm/engine/fake_connection_handler.cc +++ b/google_apis/gcm/engine/fake_connection_handler.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/fake_connection_handler.h" +#include <utility> + #include "base/logging.h" #include "google_apis/gcm/base/mcs_util.h" #include "net/socket/stream_socket.h" @@ -20,7 +22,7 @@ scoped_ptr<google::protobuf::MessageLite> BuildLoginResponse(bool fail_login) { login_response->set_id("id"); if (fail_login) login_response->mutable_error()->set_code(1); - return login_response.Pass(); + return std::move(login_response); } } // namespace diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc index e3127b9..49939b5 100644 --- a/google_apis/gcm/engine/gcm_store_impl.cc +++ b/google_apis/gcm/engine/gcm_store_impl.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/gcm_store_impl.h" +#include <utility> + #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" @@ -271,8 +273,7 @@ GCMStoreImpl::Backend::Backend( scoped_ptr<Encryptor> encryptor) : path_(path), foreground_task_runner_(foreground_task_runner), - encryptor_(encryptor.Pass()) { -} + encryptor_(std::move(encryptor)) {} GCMStoreImpl::Backend::~Backend() {} @@ -1165,10 +1166,9 @@ GCMStoreImpl::GCMStoreImpl( scoped_ptr<Encryptor> encryptor) : backend_(new Backend(path, base::ThreadTaskRunnerHandle::Get(), - encryptor.Pass())), + std::move(encryptor))), blocking_task_runner_(blocking_task_runner), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} GCMStoreImpl::~GCMStoreImpl() {} @@ -1430,7 +1430,7 @@ void GCMStoreImpl::LoadContinuation(const LoadCallback& callback, FROM_HERE_WITH_EXPLICIT_FUNCTION( "477117 GCMStoreImpl::LoadContinuation")); if (!result->success) { - callback.Run(result.Pass()); + callback.Run(std::move(result)); return; } int num_throttled_apps = 0; @@ -1448,7 +1448,7 @@ void GCMStoreImpl::LoadContinuation(const LoadCallback& callback, num_throttled_apps++; } UMA_HISTOGRAM_COUNTS("GCM.NumThrottledApps", num_throttled_apps); - callback.Run(result.Pass()); + callback.Run(std::move(result)); } void GCMStoreImpl::AddOutgoingMessageContinuation( diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc index 62bee77..684615d1 100644 --- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc +++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc @@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/gcm_store_impl.h" #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -110,13 +110,13 @@ void GCMStoreImplTest::LoadCallback( scoped_ptr<GCMStore::LoadResult>* result_dst, scoped_ptr<GCMStore::LoadResult> result) { ASSERT_TRUE(result->success); - LoadWithoutCheckCallback(result_dst, result.Pass()); + LoadWithoutCheckCallback(result_dst, std::move(result)); } void GCMStoreImplTest::LoadWithoutCheckCallback( scoped_ptr<GCMStore::LoadResult>* result_dst, scoped_ptr<GCMStore::LoadResult> result) { - *result_dst = result.Pass(); + *result_dst = std::move(result); } void GCMStoreImplTest::UpdateCallback(bool success) { @@ -163,7 +163,7 @@ TEST_F(GCMStoreImplTest, DeviceCredentials) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(kDeviceId, load_result->device_android_id); @@ -186,7 +186,7 @@ TEST_F(GCMStoreImplTest, LastCheckinInfo) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(last_checkin_time, load_result->last_checkin_time); ASSERT_EQ(accounts, load_result->last_checkin_accounts); @@ -198,7 +198,7 @@ TEST_F(GCMStoreImplTest, LastCheckinInfo) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(base::Time(), load_result->last_checkin_time); } @@ -220,7 +220,7 @@ TEST_F(GCMStoreImplTest, GServicesSettings_ProtocolV2) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(settings, load_result->gservices_settings); @@ -238,7 +238,7 @@ TEST_F(GCMStoreImplTest, GServicesSettings_ProtocolV2) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(settings, load_result->gservices_settings); @@ -266,7 +266,7 @@ TEST_F(GCMStoreImplTest, Registrations) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(2u, load_result->registrations.size()); @@ -282,7 +282,7 @@ TEST_F(GCMStoreImplTest, Registrations) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(1u, load_result->registrations.size()); @@ -307,7 +307,7 @@ TEST_F(GCMStoreImplTest, IncomingMessages) { PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(persistent_ids, load_result->incoming_messages); @@ -318,7 +318,7 @@ TEST_F(GCMStoreImplTest, IncomingMessages) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->incoming_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -347,7 +347,7 @@ TEST_F(GCMStoreImplTest, OutgoingMessages) { PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_TRUE(load_result->incoming_messages.empty()); @@ -367,7 +367,7 @@ TEST_F(GCMStoreImplTest, OutgoingMessages) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->outgoing_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -400,7 +400,7 @@ TEST_F(GCMStoreImplTest, IncomingAndOutgoingMessages) { PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(persistent_ids, load_result->incoming_messages); @@ -424,7 +424,7 @@ TEST_F(GCMStoreImplTest, IncomingAndOutgoingMessages) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->incoming_messages.clear(); load_result->outgoing_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -467,7 +467,7 @@ TEST_F(GCMStoreImplTest, PerAppMessageLimits) { } // Tear down and restore the database. - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); // Adding more messages should still fail. @@ -538,7 +538,7 @@ TEST_F(GCMStoreImplTest, AccountMapping) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(2UL, load_result->account_mappings.size()); @@ -565,7 +565,7 @@ TEST_F(GCMStoreImplTest, AccountMapping) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(1UL, load_result->account_mappings.size()); @@ -600,7 +600,7 @@ TEST_F(GCMStoreImplTest, HeartbeatInterval) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(2UL, load_result->heartbeat_intervals.size()); @@ -616,7 +616,7 @@ TEST_F(GCMStoreImplTest, HeartbeatInterval) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(1UL, load_result->heartbeat_intervals.size()); @@ -674,7 +674,7 @@ TEST_F(GCMStoreImplTest, LastTokenFetchTime) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(last_token_fetch_time, load_result->last_token_fetch_time); @@ -685,7 +685,7 @@ TEST_F(GCMStoreImplTest, LastTokenFetchTime) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(base::Time(), load_result->last_token_fetch_time); } @@ -709,7 +709,7 @@ TEST_F(GCMStoreImplTest, InstanceIDData) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(2u, load_result->instance_id_data.size()); @@ -725,7 +725,7 @@ TEST_F(GCMStoreImplTest, InstanceIDData) { base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(1u, load_result->instance_id_data.size()); diff --git a/google_apis/gcm/engine/heartbeat_manager.cc b/google_apis/gcm/engine/heartbeat_manager.cc index d7ec689..8ac70b8 100644 --- a/google_apis/gcm/engine/heartbeat_manager.cc +++ b/google_apis/gcm/engine/heartbeat_manager.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/heartbeat_manager.h" +#include <utility> + #include "base/callback.h" #include "base/location.h" #include "base/metrics/histogram.h" @@ -120,7 +122,7 @@ void HeartbeatManager::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) { base::Closure timer_task(heartbeat_timer_->user_task()); heartbeat_timer_->Stop(); - heartbeat_timer_ = timer.Pass(); + heartbeat_timer_ = std::move(timer); if (was_running) heartbeat_timer_->Start(FROM_HERE, remaining_delay, timer_task); diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_client.cc index 9385451..dfa1f85 100644 --- a/google_apis/gcm/engine/mcs_client.cc +++ b/google_apis/gcm/engine/mcs_client.cc @@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/mcs_client.h" #include <stddef.h> - #include <set> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -334,7 +334,7 @@ void MCSClient::SendMessage(const MCSMessage& message) { ReliablePacketInfo* original_packet = collapse_key_map_[collapse_key]; DVLOG(1) << "Found matching collapse key, Reusing persistent id of " << original_packet->persistent_id; - original_packet->protobuf = packet_info->protobuf.Pass(); + original_packet->protobuf = std::move(packet_info->protobuf); SetPersistentId(original_packet->persistent_id, original_packet->protobuf.get()); gcm_store_->OverwriteOutgoingMessage( @@ -379,7 +379,7 @@ void MCSClient::SendMessage(const MCSMessage& message) { } void MCSClient::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) { - heartbeat_manager_.UpdateHeartbeatTimer(timer.Pass()); + heartbeat_manager_.UpdateHeartbeatTimer(std::move(timer)); } void MCSClient::AddHeartbeatInterval(const std::string& scope, @@ -632,7 +632,7 @@ void MCSClient::HandleMCSDataMesssage( } if (send) { - SendMessage(MCSMessage(kDataMessageStanzaTag, response.Pass())); + SendMessage(MCSMessage(kDataMessageStanzaTag, std::move(response))); } } @@ -721,9 +721,8 @@ void MCSClient::HandlePacketFromWire( // Pass the login response on up. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(message_received_callback_, - MCSMessage(tag, protobuf.Pass()))); + FROM_HERE, base::Bind(message_received_callback_, + MCSMessage(tag, std::move(protobuf)))); // If there are pending messages, attempt to send one. if (!to_send_.empty()) { @@ -786,15 +785,14 @@ void MCSClient::HandlePacketFromWire( mcs_proto::DataMessageStanza* data_message = reinterpret_cast<mcs_proto::DataMessageStanza*>(protobuf.get()); if (data_message->category() == kMCSCategory) { - HandleMCSDataMesssage(protobuf.Pass()); + HandleMCSDataMesssage(std::move(protobuf)); return; } DCHECK(protobuf.get()); base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(message_received_callback_, - MCSMessage(tag, protobuf.Pass()))); + FROM_HERE, base::Bind(message_received_callback_, + MCSMessage(tag, std::move(protobuf)))); return; } default: diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc index b1b2941..2c6b467 100644 --- a/google_apis/gcm/engine/mcs_client_unittest.cc +++ b/google_apis/gcm/engine/mcs_client_unittest.cc @@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -251,7 +252,7 @@ void MCSClientTest::AddExpectedLoginRequest( setting->set_value(base::IntToString(heartbeat_interval_ms)); } GetFakeHandler()->ExpectOutgoingMessage( - MCSMessage(kLoginRequestTag, login_request.Pass())); + MCSMessage(kLoginRequestTag, std::move(login_request))); } void MCSClientTest::StoreCredentials() { @@ -429,7 +430,7 @@ TEST_F(MCSClientTest, SendMessageRMQWhileDisconnected) { // Receive the ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(2); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); EXPECT_EQ(MCSClient::SENT, message_send_status()); @@ -491,7 +492,7 @@ TEST_F(MCSClientTest, SendMessageRMQWithStreamAck) { // Receive the ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kMessageBatchSize + 1); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); // Reconnect and ensure no messages are resent. @@ -529,7 +530,7 @@ TEST_F(MCSClientTest, SendMessageRMQAckOnReconnect) { InitializeClient(); LoginClient(std::vector<std::string>()); scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(id_list)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); } @@ -575,7 +576,7 @@ TEST_F(MCSClientTest, SendMessageRMQPartialAckOnReconnect) { GetFakeHandler()->ExpectOutgoingMessage(message); } scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(acked_ids)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -638,7 +639,7 @@ TEST_F(MCSClientTest, SelectiveAckMidStream) { GetFakeHandler()->ExpectOutgoingMessage(cMessage3); std::vector<std::string> acked_ids(1, "1"); scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(acked_ids)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -725,7 +726,8 @@ TEST_F(MCSClientTest, AckWhenLimitReachedWithHeartbeat) { // The stream ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kAckLimitSize + 1); - GetFakeHandler()->ExpectOutgoingMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ExpectOutgoingMessage( + MCSMessage(kIqStanzaTag, std::move(ack))); // Receive some messages. std::vector<std::string> id_list; @@ -749,10 +751,10 @@ TEST_F(MCSClientTest, AckWhenLimitReachedWithHeartbeat) { new mcs_proto::HeartbeatAck()); heartbeat_ack->set_last_stream_id_received(kAckLimitSize + 2); GetFakeHandler()->ExpectOutgoingMessage( - MCSMessage(kHeartbeatAckTag, heartbeat_ack.Pass())); + MCSMessage(kHeartbeatAckTag, std::move(heartbeat_ack))); GetFakeHandler()->ReceiveMessage( - MCSMessage(kHeartbeatPingTag, heartbeat.Pass())); + MCSMessage(kHeartbeatPingTag, std::move(heartbeat))); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -1154,7 +1156,8 @@ TEST_F(MCSClientTest, AckWhenImmediateAckRequested) { // The stream ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kAckLimitSize - 1); - GetFakeHandler()->ExpectOutgoingMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ExpectOutgoingMessage( + MCSMessage(kIqStanzaTag, std::move(ack))); // Receive some messages. for (int i = 1; i < kAckLimitSize - 2; ++i) { diff --git a/google_apis/gcm/engine/registration_request.cc b/google_apis/gcm/engine/registration_request.cc index c0ed642..4c80020 100644 --- a/google_apis/gcm/engine/registration_request.cc +++ b/google_apis/gcm/engine/registration_request.cc @@ -5,6 +5,7 @@ #include "google_apis/gcm/engine/registration_request.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -98,7 +99,7 @@ RegistrationRequest::RegistrationRequest( const std::string& source_to_record) : callback_(callback), request_info_(request_info), - custom_request_handler_(custom_request_handler.Pass()), + custom_request_handler_(std::move(custom_request_handler)), registration_url_(registration_url), backoff_entry_(&backoff_policy), request_context_getter_(request_context_getter), diff --git a/google_apis/gcm/engine/registration_request_unittest.cc b/google_apis/gcm/engine/registration_request_unittest.cc index a4e1039..9a8ab01 100644 --- a/google_apis/gcm/engine/registration_request_unittest.cc +++ b/google_apis/gcm/engine/registration_request_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include <stdint.h> - #include <map> #include <string> +#include <utility> #include <vector> #include "base/strings/string_number_conversions.h" @@ -101,16 +101,11 @@ void GCMRegistrationRequestTest::CreateRequest(const std::string& sender_ids) { scoped_ptr<GCMRegistrationRequestHandler> request_handler( new GCMRegistrationRequestHandler(sender_ids)); request_.reset(new RegistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&RegistrationRequestTest::RegistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, - sender_ids)); + max_retry_count_, url_request_context_getter(), &recorder_, sender_ids)); } TEST_F(GCMRegistrationRequestTest, RequestSuccessful) { @@ -424,15 +419,11 @@ void InstanceIDGetTokenRequestTest::CreateRequest( new InstanceIDGetTokenRequestHandler( instance_id, authorized_entity, scope, kGCMVersion, options)); request_.reset(new RegistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&RegistrationRequestTest::RegistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, + max_retry_count_, url_request_context_getter(), &recorder_, authorized_entity)); } diff --git a/google_apis/gcm/engine/unregistration_request.cc b/google_apis/gcm/engine/unregistration_request.cc index 9e76807..a8115ec 100644 --- a/google_apis/gcm/engine/unregistration_request.cc +++ b/google_apis/gcm/engine/unregistration_request.cc @@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/unregistration_request.h" +#include <utility> + #include "base/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" @@ -61,7 +63,7 @@ UnregistrationRequest::UnregistrationRequest( const std::string& source_to_record) : callback_(callback), request_info_(request_info), - custom_request_handler_(custom_request_handler.Pass()), + custom_request_handler_(std::move(custom_request_handler)), registration_url_(registration_url), backoff_entry_(&backoff_policy), request_context_getter_(request_context_getter), diff --git a/google_apis/gcm/engine/unregistration_request_unittest.cc b/google_apis/gcm/engine/unregistration_request_unittest.cc index 0b30678..138abd9 100644 --- a/google_apis/gcm/engine/unregistration_request_unittest.cc +++ b/google_apis/gcm/engine/unregistration_request_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include <stdint.h> - #include <map> #include <string> +#include <utility> #include <vector> #include "base/strings/string_number_conversions.h" @@ -96,15 +96,11 @@ void GCMUnregistrationRequestTest::CreateRequest() { scoped_ptr<GCMUnregistrationRequestHandler> request_handler( new GCMUnregistrationRequestHandler(kAppId)); request_.reset(new UnregistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&UnregistrationRequestTest::UnregistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, + max_retry_count_, url_request_context_getter(), &recorder_, std::string())); } @@ -349,15 +345,11 @@ void InstaceIDDeleteTokenRequestTest::CreateRequest( new InstanceIDDeleteTokenRequestHandler( instance_id, authorized_entity, scope, kGCMVersion)); request_.reset(new UnregistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&UnregistrationRequestTest::UnregistrationCallback, base::Unretained(this)), - max_retry_count(), - url_request_context_getter(), - &recorder_, + max_retry_count(), url_request_context_getter(), &recorder_, std::string())); } diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc index 230d6a1..aafd4db 100644 --- a/google_apis/gcm/tools/mcs_probe.cc +++ b/google_apis/gcm/tools/mcs_probe.cc @@ -6,10 +6,10 @@ // own. #include <stdint.h> - #include <cstddef> #include <cstdio> #include <string> +#include <utility> #include <vector> #include "base/at_exit.h" @@ -356,9 +356,8 @@ void MCSProbe::LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result) { } mcs_client_->Initialize( base::Bind(&MCSProbe::ErrorCallback, base::Unretained(this)), - base::Bind(&MessageReceivedCallback), - base::Bind(&MessageSentCallback), - load_result.Pass()); + base::Bind(&MessageReceivedCallback), base::Bind(&MessageSentCallback), + std::move(load_result)); if (!android_id_ || !secret_) { DVLOG(1) << "Checkin to generate new MCS credentials."; @@ -386,7 +385,7 @@ void MCSProbe::InitializeNetworkState() { logger_.reset(new net::WriteToFileNetLogObserver()); logger_->set_capture_mode( net::NetLogCaptureMode::IncludeCookiesAndCredentials()); - logger_->StartObserving(&net_log_, log_file.Pass(), nullptr, nullptr); + logger_->StartObserving(&net_log_, std::move(log_file), nullptr, nullptr); } host_resolver_ = net::HostResolver::CreateDefaultResolver(&net_log_); @@ -402,10 +401,8 @@ void MCSProbe::InitializeNetworkState() { base::WorkerPool::GetTaskRunner(true))); transport_security_state_.reset(new net::TransportSecurityState()); - http_auth_handler_factory_ = - net::HttpAuthHandlerRegistryFactory::Create(&http_auth_preferences_, - host_resolver_.get()) - .Pass(); + http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( + &http_auth_preferences_, host_resolver_.get()); http_server_properties_.reset(new net::HttpServerPropertiesImpl()); host_mapping_rules_.reset(new net::HostMappingRules()); proxy_service_ = net::ProxyService::CreateDirectWithNetLog(&net_log_); |