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

sync/notifier/invalidator.h

 // Copyright 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.
 //
 // Interface to the invalidator, which is an object that receives
 // invalidations for registered object IDs. The corresponding
 // InvalidationHandler is notifier when such an event occurs.
 
 #ifndef SYNC_NOTIFIER_INVALIDATOR_H_
 #define SYNC_NOTIFIER_INVALIDATOR_H_
@@ skipping 65 matching lines @@
   // Returns the current invalidator state.  When called from within
   // InvalidationHandler::OnInvalidatorStateChange(), this must return
   // the updated state.
   virtual InvalidatorState GetInvalidatorState() const = 0;
 
   // The observers won't be notified of any notifications until
   // UpdateCredentials is called at least once. It can be called more than
   // once.
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) = 0;
+
+  // This is here only to support the old p2p notification implementation,
+  // which is still used by sync integration tests.
+  // TODO(akalin): Remove this once we move the integration tests off p2p
+  // notifications.
+  virtual void SendInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map) = 0;
 };
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_H_