summaryrefslogtreecommitdiffstats
path: root/google_apis/gcm/engine
diff options
context:
space:
mode:
Diffstat (limited to 'google_apis/gcm/engine')
-rw-r--r--google_apis/gcm/engine/connection_factory_impl.cc5
-rw-r--r--google_apis/gcm/engine/connection_factory_impl_unittest.cc3
-rw-r--r--google_apis/gcm/engine/connection_handler_impl.cc6
-rw-r--r--google_apis/gcm/engine/connection_handler_impl_unittest.cc4
-rw-r--r--google_apis/gcm/engine/fake_connection_handler.cc4
-rw-r--r--google_apis/gcm/engine/gcm_store_impl.cc14
-rw-r--r--google_apis/gcm/engine/gcm_store_impl_unittest.cc50
-rw-r--r--google_apis/gcm/engine/heartbeat_manager.cc4
-rw-r--r--google_apis/gcm/engine/mcs_client.cc20
-rw-r--r--google_apis/gcm/engine/mcs_client_unittest.cc23
-rw-r--r--google_apis/gcm/engine/registration_request.cc3
-rw-r--r--google_apis/gcm/engine/registration_request_unittest.cc19
-rw-r--r--google_apis/gcm/engine/unregistration_request.cc4
-rw-r--r--google_apis/gcm/engine/unregistration_request_unittest.cc18
14 files changed, 85 insertions, 92 deletions
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()));
}
generated by cgit v1.1 at 2024-06-14 05:10:33 +0000