Remove syncer::IncomingInvalidationSource

sync/notifier/p2p_invalidator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/p2p_invalidator.h"
 
 #include <cstddef>
 
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 47 matching lines @@
 
   void TriggerOnInvalidatorStateChange(InvalidatorState state) {
     if (state == INVALIDATIONS_ENABLED) {
       fake_push_client_->EnableNotifications();
     } else {
       fake_push_client_->DisableNotifications(ToNotifierReasonForTest(state));
     }
   }
 
   void TriggerOnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map,
-      IncomingInvalidationSource source) {
+      const ObjectIdInvalidationMap& invalidation_map) {
     const P2PNotificationData notification_data(
-        "", NOTIFY_ALL, invalidation_map, source);
+        "", NOTIFY_ALL, invalidation_map);
     notifier::Notification notification;
     notification.channel = kSyncP2PNotificationChannel;
     notification.data = notification_data.ToString();
     fake_push_client_->SimulateIncomingNotification(notification);
   }
 
  private:
   // Owned by |invalidator_|.
   notifier::FakePushClient* fake_push_client_;
   scoped_ptr<P2PInvalidator> invalidator_;
@@ skipping 44 matching lines @@
     EXPECT_FALSE(target_str.empty());
     EXPECT_EQ(target, P2PNotificationTargetFromString(target_str));
   }
   EXPECT_EQ(NOTIFY_SELF, P2PNotificationTargetFromString("unknown"));
 }
 
 // Make sure notification targeting works correctly.
 TEST_F(P2PInvalidatorTest, P2PNotificationDataIsTargeted) {
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_SELF, ObjectIdInvalidationMap(), REMOTE_INVALIDATION);
+        "sender", NOTIFY_SELF, ObjectIdInvalidationMap());
     EXPECT_TRUE(notification_data.IsTargeted("sender"));
     EXPECT_FALSE(notification_data.IsTargeted("other1"));
     EXPECT_FALSE(notification_data.IsTargeted("other2"));
   }
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_OTHERS, ObjectIdInvalidationMap(),
-        REMOTE_INVALIDATION);
+        "sender", NOTIFY_OTHERS, ObjectIdInvalidationMap());
     EXPECT_FALSE(notification_data.IsTargeted("sender"));
     EXPECT_TRUE(notification_data.IsTargeted("other1"));
     EXPECT_TRUE(notification_data.IsTargeted("other2"));
   }
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_ALL, ObjectIdInvalidationMap(), REMOTE_INVALIDATION);
+        "sender", NOTIFY_ALL, ObjectIdInvalidationMap());
     EXPECT_TRUE(notification_data.IsTargeted("sender"));
     EXPECT_TRUE(notification_data.IsTargeted("other1"));
     EXPECT_TRUE(notification_data.IsTargeted("other2"));
   }
 }
 
 // Make sure the P2PNotificationData <-> string conversions work for a
 // default-constructed P2PNotificationData.
 TEST_F(P2PInvalidatorTest, P2PNotificationDataDefault) {
   const P2PNotificationData notification_data;
   EXPECT_TRUE(notification_data.IsTargeted(""));
   EXPECT_FALSE(notification_data.IsTargeted("other1"));
   EXPECT_FALSE(notification_data.IsTargeted("other2"));
   EXPECT_TRUE(notification_data.GetIdInvalidationMap().empty());
   const std::string& notification_data_str = notification_data.ToString();
   EXPECT_EQ(
       "{\"idInvalidationMap\":[],\"notificationType\":\"notifySelf\","
-      "\"senderId\":\"\",\"source\":0}", notification_data_str);
+      "\"senderId\":\"\"}", notification_data_str);
 
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 // Make sure the P2PNotificationData <-> string conversions work for a
 // non-default-constructed P2PNotificationData.
 TEST_F(P2PInvalidatorTest, P2PNotificationDataNonDefault) {
   const ObjectIdInvalidationMap& invalidation_map =
       ObjectIdSetToInvalidationMap(
           ModelTypeSetToObjectIdSet(ModelTypeSet(BOOKMARKS, THEMES)), "");
   const P2PNotificationData notification_data(
-      "sender", NOTIFY_ALL, invalidation_map, LOCAL_INVALIDATION);
+      "sender", NOTIFY_ALL, invalidation_map);
   EXPECT_TRUE(notification_data.IsTargeted("sender"));
   EXPECT_TRUE(notification_data.IsTargeted("other1"));
   EXPECT_TRUE(notification_data.IsTargeted("other2"));
   EXPECT_THAT(invalidation_map,
               Eq(notification_data.GetIdInvalidationMap()));
   const std::string& notification_data_str = notification_data.ToString();
   EXPECT_EQ(
       "{\"idInvalidationMap\":["
       "{\"objectId\":{\"name\":\"BOOKMARK\",\"source\":1004},"
       "\"state\":{\"ackHandle\":{\"state\":\"\",\"timestamp\":\"0\"},"
       "\"payload\":\"\"}},"
       "{\"objectId\":{\"name\":\"THEME\",\"source\":1004},"
       "\"state\":{\"ackHandle\":{\"state\":\"\",\"timestamp\":\"0\"},"
       "\"payload\":\"\"}}"
       "],\"notificationType\":\"notifyAll\","
-      "\"senderId\":\"sender\",\"source\":1}", notification_data_str);
+      "\"senderId\":\"sender\"}", notification_data_str);
 
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 // Set up the P2PInvalidator, simulate a successful connection, and send
 // a notification with the default target (NOTIFY_OTHERS).  The
 // observer should receive only a notification from the call to
 // UpdateEnabledTypes().
@@ skipping 25 matching lines @@
   ReflectSentNotifications();
   push_client->EnableNotifications();
   EXPECT_EQ(INVALIDATIONS_ENABLED, fake_handler_.GetInvalidatorState());
 
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(
       ModelTypeInvalidationMapToObjectIdInvalidationMap(
           MakeInvalidationMap(enabled_types)),
       Eq(fake_handler_.GetLastInvalidationMap()));
-  EXPECT_EQ(REMOTE_INVALIDATION, fake_handler_.GetLastInvalidationSource());
 
   // Sent with target NOTIFY_OTHERS so should not be propagated to
   // |fake_handler_|.
   {
     const ObjectIdInvalidationMap& invalidation_map =
         ObjectIdSetToInvalidationMap(
             ModelTypeSetToObjectIdSet(ModelTypeSet(THEMES, APPS)), "");
     invalidator->SendInvalidation(invalidation_map);
   }
 
@@ skipping 25 matching lines @@
   ReflectSentNotifications();
   push_client->EnableNotifications();
   EXPECT_EQ(INVALIDATIONS_ENABLED, fake_handler_.GetInvalidatorState());
 
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(
       ModelTypeInvalidationMapToObjectIdInvalidationMap(
           MakeInvalidationMap(enabled_types)),
       Eq(fake_handler_.GetLastInvalidationMap()));
-  EXPECT_EQ(REMOTE_INVALIDATION, fake_handler_.GetLastInvalidationSource());
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(P2PNotificationData());
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
 
   const ObjectIdInvalidationMap& expected_ids =
       ModelTypeInvalidationMapToObjectIdInvalidationMap(
           MakeInvalidationMap(expected_types));
 
   // Should be propagated.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender", NOTIFY_SELF,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender", NOTIFY_SELF, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(2, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(expected_ids, Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_SELF,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender2", NOTIFY_SELF, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(2, fake_handler_.GetInvalidationCount());
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender", NOTIFY_SELF,
-                          ObjectIdInvalidationMap(), REMOTE_INVALIDATION));
+      P2PNotificationData("sender", NOTIFY_SELF, ObjectIdInvalidationMap()));
   ReflectSentNotifications();
   EXPECT_EQ(2, fake_handler_.GetInvalidationCount());
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender", NOTIFY_OTHERS,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender", NOTIFY_OTHERS, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(2, fake_handler_.GetInvalidationCount());
 
   // Should be propagated.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_OTHERS,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender2", NOTIFY_OTHERS, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(3, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(expected_ids, Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_OTHERS,
-                          ObjectIdInvalidationMap(), REMOTE_INVALIDATION));
+      P2PNotificationData("sender2", NOTIFY_OTHERS, ObjectIdInvalidationMap()));
   ReflectSentNotifications();
   EXPECT_EQ(3, fake_handler_.GetInvalidationCount());
 
   // Should be propagated.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender", NOTIFY_ALL,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender", NOTIFY_ALL, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(4, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(expected_ids, Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Should be propagated.
   invalidator->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_ALL,
-                          invalidation_map, REMOTE_INVALIDATION));
+      P2PNotificationData("sender2", NOTIFY_ALL, invalidation_map));
   ReflectSentNotifications();
   EXPECT_EQ(5, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(expected_ids, Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(
-  P2PNotificationData("sender2", NOTIFY_ALL,
-                      ObjectIdInvalidationMap(), REMOTE_INVALIDATION));
+  P2PNotificationData("sender2", NOTIFY_ALL, ObjectIdInvalidationMap()));
   ReflectSentNotifications();
   EXPECT_EQ(5, fake_handler_.GetInvalidationCount());
 }
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     P2PInvalidatorTest, InvalidatorTest,
     P2PInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer