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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: google_apis/gcm/engine/gcm_store_impl_unittest.cc

Issue 1547233002: Convert Pass()→std::move() in //google_apis (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
« no previous file with comments | « google_apis/gcm/engine/gcm_store_impl.cc ('k') | google_apis/gcm/engine/heartbeat_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index 62bee771f25bba7ce82d9c08b7345a753aa067b0..684615d1e29450336def892edc3defed0b06bef7 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());
« no previous file with comments | « google_apis/gcm/engine/gcm_store_impl.cc ('k') | google_apis/gcm/engine/heartbeat_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698