Index: sync/notifier/p2p_invalidator_unittest.cc |
diff --git a/sync/notifier/p2p_invalidator_unittest.cc b/sync/notifier/p2p_invalidator_unittest.cc |
index 1b7aad45ede5d6b3f7b03a7b45209b0fa630be27..6acc3d1703a47b12f134d95d928d78041afa02cd 100644 |
--- a/sync/notifier/p2p_invalidator_unittest.cc |
+++ b/sync/notifier/p2p_invalidator_unittest.cc |
@@ -69,7 +69,7 @@ class P2PInvalidatorTestDelegate { |
void TriggerOnIncomingInvalidation( |
const ObjectIdInvalidationMap& invalidation_map) { |
const P2PNotificationData notification_data( |
- "", NOTIFY_ALL, invalidation_map); |
+ std::string(), NOTIFY_ALL, invalidation_map); |
notifier::Notification notification; |
notification.channel = kSyncP2PNotificationChannel; |
notification.data = notification_data.ToString(); |
@@ -160,7 +160,7 @@ TEST_F(P2PInvalidatorTest, P2PNotificationDataIsTargeted) { |
// default-constructed P2PNotificationData. |
TEST_F(P2PInvalidatorTest, P2PNotificationDataDefault) { |
const P2PNotificationData notification_data; |
- EXPECT_TRUE(notification_data.IsTargeted("")); |
+ EXPECT_TRUE(notification_data.IsTargeted(std::string())); |
EXPECT_FALSE(notification_data.IsTargeted("other1")); |
EXPECT_FALSE(notification_data.IsTargeted("other2")); |
EXPECT_TRUE(notification_data.GetIdInvalidationMap().empty()); |
@@ -179,7 +179,8 @@ TEST_F(P2PInvalidatorTest, P2PNotificationDataDefault) { |
TEST_F(P2PInvalidatorTest, P2PNotificationDataNonDefault) { |
const ObjectIdInvalidationMap& invalidation_map = |
ObjectIdSetToInvalidationMap( |
- ModelTypeSetToObjectIdSet(ModelTypeSet(BOOKMARKS, THEMES)), ""); |
+ ModelTypeSetToObjectIdSet(ModelTypeSet(BOOKMARKS, THEMES)), |
+ std::string()); |
const P2PNotificationData notification_data( |
"sender", NOTIFY_ALL, invalidation_map); |
EXPECT_TRUE(notification_data.IsTargeted("sender")); |
@@ -247,7 +248,8 @@ TEST_F(P2PInvalidatorTest, NotificationsBasic) { |
{ |
const ObjectIdInvalidationMap& invalidation_map = |
ObjectIdSetToInvalidationMap( |
- ModelTypeSetToObjectIdSet(ModelTypeSet(THEMES, APPS)), ""); |
+ ModelTypeSetToObjectIdSet(ModelTypeSet(THEMES, APPS)), |
+ std::string()); |
invalidator->SendInvalidation(invalidation_map); |
} |
@@ -264,8 +266,8 @@ TEST_F(P2PInvalidatorTest, SendNotificationData) { |
const ModelTypeSet expected_types(THEMES); |
const ObjectIdInvalidationMap& invalidation_map = |
- ObjectIdSetToInvalidationMap( |
- ModelTypeSetToObjectIdSet(changed_types), ""); |
+ ObjectIdSetToInvalidationMap(ModelTypeSetToObjectIdSet(changed_types), |
+ std::string()); |
P2PInvalidator* const invalidator = delegate_.GetInvalidator(); |
notifier::FakePushClient* const push_client = delegate_.GetPushClient(); |