Refactor common invalidation framework types

chrome/browser/invalidation/invalidation_service_test_template.h

 // Copyright 2013 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.
 
 // This class defines tests that implementations of InvalidationService should
 // pass in order to be conformant.  Here's how you use it to test your
 // implementation.
 //
 // Say your class is called MyInvalidationService.  Then you need to define a
 // class called MyInvalidationServiceTestDelegate in
@@ skipping 58 matching lines @@
 // Easy!
 
 #ifndef CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 #define CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
+#include "sync/internal_api/public/base/ack_handle.h"
+#include "sync/internal_api/public/base/invalidation.h"
+#include "sync/internal_api/public/base/object_id_invalidation_map_test_util.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/object_id_invalidation_map.h"
-#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 template <typename InvalidatorTestDelegate>
 class InvalidationServiceTest : public testing::Test {
  protected:
   InvalidationServiceTest()
       : id1(ipc::invalidation::ObjectSource::CHROME_SYNC, "BOOKMARK"),
         id2(ipc::invalidation::ObjectSource::CHROME_SYNC, "PREFERENCE"),
         id3(ipc::invalidation::ObjectSource::CHROME_SYNC, "AUTOFILL"),
         id4(ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
@@ skipping 21 matching lines @@
 // between.  The handler should only see invalidations when its registered and
 // its IDs are registered.
 TYPED_TEST_P(InvalidationServiceTest, Basic) {
   invalidation::InvalidationService* const invalidator =
       this->CreateAndInitializeInvalidationService();
 
   syncer::FakeInvalidationHandler handler;
 
   invalidator->RegisterInvalidationHandler(&handler);
 
-  syncer::ObjectIdInvalidationMap states;
-  states[this->id1].payload = "1";
-  states[this->id2].payload = "2";
-  states[this->id3].payload = "3";
+  syncer::ObjectIdInvalidationMap invalidation_map;
+  invalidation_map.Insert(syncer::Invalidation::Init(this->id1, 1, "1"));
+  invalidation_map.Insert(syncer::Invalidation::Init(this->id2, 2, "2"));
+  invalidation_map.Insert(syncer::Invalidation::Init(this->id3, 3, "3"));
 
   // Should be ignored since no IDs are registered to |handler|.
-  this->delegate_.TriggerOnIncomingInvalidation(states);
+  this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
   EXPECT_EQ(0, handler.GetInvalidationCount());
 
   syncer::ObjectIdSet ids;
   ids.insert(this->id1);
   ids.insert(this->id2);
   invalidator->UpdateRegisteredInvalidationIds(&handler, ids);
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler.GetInvalidatorState());
 
-  syncer::ObjectIdInvalidationMap expected_states;
-  expected_states[this->id1].payload = "1";
-  expected_states[this->id2].payload = "2";
+  syncer::ObjectIdInvalidationMap expected_invalidations;
+  expected_invalidations.Insert(syncer::Invalidation::Init(this->id1, 1, "1"));
+  expected_invalidations.Insert(syncer::Invalidation::Init(this->id2, 2, "2"));
 
-  this->delegate_.TriggerOnIncomingInvalidation(states);
+  this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
   EXPECT_EQ(1, handler.GetInvalidationCount());
-  EXPECT_THAT(expected_states, Eq(handler.GetLastInvalidationMap()));
+  EXPECT_THAT(expected_invalidations, Eq(handler.GetLastInvalidationMap()));
 
   ids.erase(this->id1);
   ids.insert(this->id3);
   invalidator->UpdateRegisteredInvalidationIds(&handler, ids);
 
-  expected_states.erase(this->id1);
-  expected_states[this->id3].payload = "3";
+  expected_invalidations = syncer::ObjectIdInvalidationMap();
+  expected_invalidations.Insert(syncer::Invalidation::Init(this->id2, 2, "2"));
+  expected_invalidations.Insert(syncer::Invalidation::Init(this->id3, 3, "3"));
 
   // Removed object IDs should not be notified, newly-added ones should.
-  this->delegate_.TriggerOnIncomingInvalidation(states);
+  this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
   EXPECT_EQ(2, handler.GetInvalidationCount());
-  EXPECT_THAT(expected_states, Eq(handler.GetLastInvalidationMap()));
+  EXPECT_THAT(expected_invalidations, Eq(handler.GetLastInvalidationMap()));
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler.GetInvalidatorState());
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED,
             handler.GetInvalidatorState());
 
   invalidator->UnregisterInvalidationHandler(&handler);
 
   // Should be ignored since |handler| isn't registered anymore.
-  this->delegate_.TriggerOnIncomingInvalidation(states);
+  this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
   EXPECT_EQ(2, handler.GetInvalidationCount());
 }
 
 // Register handlers and some IDs for those handlers, register a handler with
 // no IDs, and register a handler with some IDs but unregister it.  Then,
 // dispatch some invalidations and invalidations.  Handlers that are registered
 // should get invalidations, and the ones that have registered IDs should
 // receive invalidations for those IDs.
 TYPED_TEST_P(InvalidationServiceTest, MultipleHandlers) {
   invalidation::InvalidationService* const invalidator =
@@ skipping 34 matching lines @@
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler1.GetInvalidatorState());
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler2.GetInvalidatorState());
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler3.GetInvalidatorState());
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler4.GetInvalidatorState());
 
   {
-    syncer::ObjectIdInvalidationMap states;
-    states[this->id1].payload = "1";
-    states[this->id2].payload = "2";
-    states[this->id3].payload = "3";
-    states[this->id4].payload = "4";
-    this->delegate_.TriggerOnIncomingInvalidation(states);
+    syncer::ObjectIdInvalidationMap invalidation_map;
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id1, 1, "1"));
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id2, 2, "2"));
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id3, 3, "3"));
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id4, 4, "4"));
+    this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
 
-    syncer::ObjectIdInvalidationMap expected_states;
-    expected_states[this->id1].payload = "1";
-    expected_states[this->id2].payload = "2";
+    syncer::ObjectIdInvalidationMap expected_invalidations;
+    expected_invalidations.Insert(
+        syncer::Invalidation::Init(this->id1, 1, "1"));
+    expected_invalidations.Insert(
+        syncer::Invalidation::Init(this->id2, 2, "2"));
 
     EXPECT_EQ(1, handler1.GetInvalidationCount());
-    EXPECT_THAT(expected_states, Eq(handler1.GetLastInvalidationMap()));
+    EXPECT_THAT(expected_invalidations, Eq(handler1.GetLastInvalidationMap()));
 
-    expected_states.clear();
-    expected_states[this->id3].payload = "3";
+    expected_invalidations = syncer::ObjectIdInvalidationMap();
+    expected_invalidations.Insert(
+        syncer::Invalidation::Init(this->id3, 3, "3"));
 
     EXPECT_EQ(1, handler2.GetInvalidationCount());
-    EXPECT_THAT(expected_states, Eq(handler2.GetLastInvalidationMap()));
+    EXPECT_THAT(expected_invalidations, Eq(handler2.GetLastInvalidationMap()));
 
     EXPECT_EQ(0, handler3.GetInvalidationCount());
     EXPECT_EQ(0, handler4.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler1.GetInvalidatorState());
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
@@ skipping 39 matching lines @@
   // further invalidations.
   invalidator->UpdateRegisteredInvalidationIds(&handler1,
                                                syncer::ObjectIdSet());
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler1.GetInvalidatorState());
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler2.GetInvalidatorState());
 
   {
-    syncer::ObjectIdInvalidationMap states;
-    states[this->id1].payload = "1";
-    states[this->id2].payload = "2";
-    states[this->id3].payload = "3";
-    this->delegate_.TriggerOnIncomingInvalidation(states);
+    syncer::ObjectIdInvalidationMap invalidation_map;
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id1, 1, "1"));
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id2, 2, "2"));
+    invalidation_map.Insert(syncer::Invalidation::Init(this->id3, 3, "3"));
+    this->delegate_.TriggerOnIncomingInvalidation(invalidation_map);
     EXPECT_EQ(0, handler1.GetInvalidationCount());
     EXPECT_EQ(1, handler2.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       syncer::TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler1.GetInvalidatorState());
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler2.GetInvalidatorState());
@@ skipping 51 matching lines @@
             handler.GetLastRetrievedState());
 
   invalidator->UnregisterInvalidationHandler(&handler);
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidationServiceTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
 #endif  // CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_