Remove WeakHandle from components/invalidation

components/invalidation/invalidation_notifier.h

Index: components/invalidation/invalidation_notifier.h
diff --git a/components/invalidation/invalidation_notifier.h b/components/invalidation/invalidation_notifier.h
index 154d1e6dff404a670974861df763994ca8f000fa..c1fd7a682a226d992758bcfe770908bb160b212e 100644
--- a/components/invalidation/invalidation_notifier.h
+++ b/components/invalidation/invalidation_notifier.h
@@ -17,13 +17,13 @@
 #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;
@@ -43,8 +43,9 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
       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();
@@ -84,8 +85,9 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
   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_;