Invalidation trickles mega-patch

chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
 #include "chrome/test/base/testing_profile.h"
 #include "sync/notifier/fake_invalidation_handler.h"
@@ skipping 25 matching lines @@
 
   void DestroyInvalidationService() {
     invalidation_service_->Shutdown();
   }
 
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
     fake_invalidator_->EmitOnInvalidatorStateChange(state);
   }
 
   void TriggerOnIncomingInvalidation(
-      const syncer::ObjectIdInvalidationMap& invalidation_map) {
-    fake_invalidator_->EmitOnIncomingInvalidation(invalidation_map);
+      const syncer::ObjectIdInvalidationMap& invalidations) {
+    fake_invalidator_->EmitOnIncomingInvalidation(invalidations);
   }
 
   syncer::FakeInvalidator* fake_invalidator_;  // owned by the service.
   scoped_ptr<TiclInvalidationService> invalidation_service_;
   scoped_ptr<TestingProfile> profile_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     TiclInvalidationServiceTest, InvalidationServiceTest,
     TiclInvalidationServiceTestDelegate);
 
 }  // namespace invalidation