Remove WeakHandle from components/invalidation

components/invalidation/invalidation_notifier.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.
 //
 // An implementation of Invalidator that wraps an invalidation
 // client.  Handles the details of connecting to XMPP and hooking it
 // up to the invalidation client.
 //
 // You probably don't want to use this directly; use
 // NonBlockingInvalidator.
 
 #ifndef COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
 #define COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"

[pavely, 2014/08/08 20:08:30]

Do you need to include weak_ptr.h  and ref_counted.h as well?

[rlarocque, 2014/08/08 21:19:35]

According to IWYU, yes.

+#include "base/sequenced_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/invalidation/invalidation_export.h"
 #include "components/invalidation/invalidation_state_tracker.h"
 #include "components/invalidation/invalidator.h"
 #include "components/invalidation/invalidator_registrar.h"
 #include "components/invalidation/sync_invalidation_listener.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 // This class must live on the IO thread.
 class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
     : public Invalidator,
       public SyncInvalidationListener::Delegate,
       public base::NonThreadSafe {
  public:
   // |invalidation_state_tracker| must be initialized.
   InvalidationNotifier(
       scoped_ptr<SyncNetworkChannel> network_channel,
       const std::string& invalidator_client_id,
       const UnackedInvalidationsMap& saved_invalidations,
       const std::string& invalidation_bootstrap_data,
-      const WeakHandle<InvalidationStateTracker>&
-          invalidation_state_tracker,
+      const base::WeakPtr<InvalidationStateTracker>& invalidation_state_tracker,
+      scoped_refptr<base::SingleThreadTaskRunner>
+          invalidation_state_tracker_task_runner,
       const std::string& client_info);
 
   virtual ~InvalidationNotifier();
 
   // Invalidator implementation.
   virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
@@ skipping 19 matching lines @@
     STARTED
   };
   State state_;
 
   InvalidatorRegistrar registrar_;
 
   // Passed to |invalidation_listener_|.
   const UnackedInvalidationsMap saved_invalidations_;
 
   // Passed to |invalidation_listener_|.
-  const WeakHandle<InvalidationStateTracker>
-      invalidation_state_tracker_;
+  const base::WeakPtr<InvalidationStateTracker> invalidation_state_tracker_;
+  scoped_refptr<base::SequencedTaskRunner>
+      invalidation_state_tracker_task_runner_;
 
   // Passed to |invalidation_listener_|.
   const std::string client_info_;
 
   // The client ID to pass to |invalidation_listener_|.
   const std::string invalidator_client_id_;
 
   // The initial bootstrap data to pass to |invalidation_listener_|.
   const std::string invalidation_bootstrap_data_;
 
   // The invalidation listener.
   SyncInvalidationListener invalidation_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationNotifier);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_