Remove WeakHandle from components/invalidation

components/invalidation/sync_invalidation_listener.h

 // Copyright 2014 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.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
 #define COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/invalidation/ack_handler.h"
 #include "components/invalidation/invalidation_export.h"
 #include "components/invalidation/invalidation_state_tracker.h"
 #include "components/invalidation/invalidator_state.h"
 #include "components/invalidation/state_writer.h"
 #include "components/invalidation/sync_system_resources.h"
 #include "components/invalidation/unacked_invalidation_set.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
@@ skipping 31 matching lines @@
       scoped_ptr<SyncNetworkChannel> network_channel);
 
   // Calls Stop().
   virtual ~SyncInvalidationListener();
 
   // Does not take ownership of |delegate| or |state_writer|.
   // |invalidation_state_tracker| must be initialized.
   void Start(
       const CreateInvalidationClientCallback&
           create_invalidation_client_callback,
-      const std::string& client_id, const std::string& client_info,
+      const std::string& client_id,
+      const std::string& client_info,
       const std::string& invalidation_bootstrap_data,
       const UnackedInvalidationsMap& initial_object_states,
-      const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
+      const base::WeakPtr<InvalidationStateTracker>& invalidation_state_tracker,
+      const scoped_refptr<base::SequencedTaskRunner>&
+          invalidation_state_tracker_task_runner,
       Delegate* delegate);
 
   void UpdateCredentials(const std::string& email, const std::string& token);
 
   // Update the set of object IDs that we're interested in getting
   // notifications for.  May be called at any time.
   void UpdateRegisteredIds(const ObjectIdSet& ids);
 
   // invalidation::InvalidationListener implementation.
   virtual void Ready(
@@ skipping 70 matching lines @@
   // be safely on disk by the end of the call, but it should ensure that the
   // data makes it to disk eventually.
   void SaveInvalidations(const ObjectIdInvalidationMap& to_save);
 
   // Emits previously saved invalidations to their registered observers.
   void EmitSavedInvalidations(const ObjectIdInvalidationMap& to_emit);
 
   // Generate a Dictionary with all the debugging information.
   scoped_ptr<base::DictionaryValue> CollectDebugData() const;
 
-  WeakHandle<AckHandler> GetThisAsAckHandler();
+  base::WeakPtr<AckHandler> AsWeakPtr();
 
   scoped_ptr<SyncNetworkChannel> sync_network_channel_;
   SyncSystemResources sync_system_resources_;
   UnackedInvalidationsMap unacked_invalidations_map_;
-  WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
+  base::WeakPtr<InvalidationStateTracker> invalidation_state_tracker_;
+  scoped_refptr<base::SequencedTaskRunner>
+      invalidation_state_tracker_task_runner_;
   Delegate* delegate_;
   scoped_ptr<invalidation::InvalidationClient> invalidation_client_;
   scoped_ptr<RegistrationManager> registration_manager_;
   // Stored to pass to |registration_manager_| on start.
   ObjectIdSet registered_ids_;
 
   // The states of the ticl and the push client.
   InvalidatorState ticl_state_;
   InvalidatorState push_client_state_;
 
   base::WeakPtrFactory<SyncInvalidationListener> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncInvalidationListener);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_