Invalidation trickles mega-patch

sync/notifier/non_blocking_invalidator_unittest.cc

Index: sync/notifier/non_blocking_invalidator_unittest.cc
diff --git a/sync/notifier/non_blocking_invalidator_unittest.cc b/sync/notifier/non_blocking_invalidator_unittest.cc
index f463077c08825ee69e5b94dada7489f445ee6892..54057ddd6d7d15dbc13d169350aa508c9c98105f 100644
--- a/sync/notifier/non_blocking_invalidator_unittest.cc
+++ b/sync/notifier/non_blocking_invalidator_unittest.cc
@@ -17,7 +17,6 @@
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidator_test_template.h"
-#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
@@ -49,7 +48,7 @@ class NonBlockingInvalidatorTestDelegate {
         new NonBlockingInvalidator(
             invalidator_options,
             invalidator_client_id,
-            InvalidationStateMap(),
+            UnackedInvalidationStorageMap(),
             initial_state,
             MakeWeakHandle(invalidation_state_tracker),
             "fake_client_info"));
@@ -81,8 +80,8 @@ class NonBlockingInvalidatorTestDelegate {
   }
 
   void TriggerOnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) {
-    invalidator_->OnIncomingInvalidation(invalidation_map);
+      const ObjectIdInvalidationMap& invalidations) {
+    invalidator_->OnIncomingInvalidation(invalidations);
   }
 
  private: