Merge 208347 "Revert 208315 "Make use of InvalidationService""

sync/notifier/invalidator_registrar_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator_registrar.h"
@@ skipping 39 matching lines @@
 
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE {
     return registrar_.GetInvalidatorState();
   }
 
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE {
     // Do nothing.
   }
 
+  virtual void SendInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
+    // Do nothing.
+  }
+
  private:
   InvalidatorRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrarInvalidator);
 };
 
 class RegistrarInvalidatorTestDelegate {
  public:
   RegistrarInvalidatorTestDelegate() {}
 
@@ skipping 85 matching lines @@
   EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, "");
 
   registrar.UnregisterHandler(&handler2);
   registrar.UnregisterHandler(&handler1);
 }
 #endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace
 
 }  // namespace syncer