[Sync] Make P2PNotifier behave more like InvalidationNotifier

chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc

 // Copyright (c) 2011 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/sync/notifier/non_blocking_invalidation_notifier.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list_threadsafe.h"
@@ skipping 14 matching lines @@
   void AddObserver(SyncNotifierObserver* observer);
   void RemoveObserver(SyncNotifierObserver* observer);
 
   // Helpers called on I/O thread.
   void Initialize(const notifier::NotifierOptions& notifier_options,
                   const std::string& client_info);
   void Teardown();
   void SetUniqueId(const std::string& unique_id);
   void SetState(const std::string& state);
   void UpdateCredentials(const std::string& email, const std::string& token);
-  void UpdateEnabledTypes(const syncable::ModelTypeSet& types);
-  void SendNotification();
+  void UpdateEnabledTypes(const syncable::ModelTypeSet& enabled_types);
 
   // SyncNotifierObserver implementation (all called on I/O thread).
   virtual void OnIncomingNotification(
       const syncable::ModelTypePayloadMap& type_payloads);
   virtual void OnNotificationStateChange(bool notifications_enabled);
   virtual void StoreState(const std::string& state);
 
  private:
   friend class
       base::RefCountedThreadSafe<NonBlockingInvalidationNotifier::Core>;
@@ skipping 57 matching lines @@
   invalidation_notifier_->SetState(state);
 }
 
 void NonBlockingInvalidationNotifier::Core::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
   invalidation_notifier_->UpdateCredentials(email, token);
 }
 
 void NonBlockingInvalidationNotifier::Core::UpdateEnabledTypes(
-    const syncable::ModelTypeSet& types) {
+    const syncable::ModelTypeSet& enabled_types) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
-  invalidation_notifier_->UpdateEnabledTypes(types);
+  invalidation_notifier_->UpdateEnabledTypes(enabled_types);
 }
 
 void NonBlockingInvalidationNotifier::Core::OnIncomingNotification(
         const syncable::ModelTypePayloadMap& type_payloads) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
   observers_->Notify(&SyncNotifierObserver::OnIncomingNotification,
                      type_payloads);
 }
 
 void NonBlockingInvalidationNotifier::Core::OnNotificationStateChange(
@@ skipping 82 matching lines @@
           FROM_HERE,
           NewRunnableMethod(
               core_.get(),
               &NonBlockingInvalidationNotifier::Core::UpdateCredentials,
               email, token))) {
     NOTREACHED();
   }
 }
 
 void NonBlockingInvalidationNotifier::UpdateEnabledTypes(
-    const syncable::ModelTypeSet& types) {
+    const syncable::ModelTypeSet& enabled_types) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   if (!io_message_loop_proxy_->PostTask(
           FROM_HERE,
           NewRunnableMethod(
               core_.get(),
               &NonBlockingInvalidationNotifier::Core::UpdateEnabledTypes,
-              types))) {
+              enabled_types))) {
     NOTREACHED();
   }
 }
 
-void NonBlockingInvalidationNotifier::SendNotification() {
+void NonBlockingInvalidationNotifier::SendNotification(
+    const syncable::ModelTypeSet& changed_types) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   // InvalidationClient doesn't implement SendNotification(), so no
   // need to forward on the call.
 }
 
 }  // namespace sync_notifier