Remove WeakHandle from components/invalidation

components/invalidation/invalidation.h

Index: components/invalidation/invalidation.h
diff --git a/components/invalidation/invalidation.h b/components/invalidation/invalidation.h
index 4d6a5e3d7cc5e84505bae0c498ebf9263164c79b..ccc1b199e7dc3e1766976f9ec6dacc9d0ad9adfa 100644
--- a/components/invalidation/invalidation.h
+++ b/components/invalidation/invalidation.h
@@ -9,11 +9,12 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner.h"
 #include "base/values.h"
 #include "components/invalidation/ack_handle.h"
 #include "components/invalidation/invalidation_export.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 
 namespace syncer {
 
@@ -57,7 +58,9 @@ class INVALIDATION_EXPORT Invalidation {
   //
   // Note that some sources of invalidations do not support ack tracking, and do
   // not set the ack_handler.  This will be hidden from users of this class.
-  void set_ack_handler(syncer::WeakHandle<AckHandler> ack_handler);
+  void SetAckHandler(
+      base::WeakPtr<AckHandler> handler,
+      scoped_refptr<base::SequencedTaskRunner> handler_task_runner);

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

I've seen usage of const scoped_refptr<...>& in the code which saves you one
pair of AddRef/Release. Do you know if there is any guideline about it?

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

Some support it as an efficiency improvement.  Personally, I think the
improvements are not really measureable, so I'm indifferent.  In this CL, I've
tried to maintain the status quo.

As far as I know, there's no rule about this set out in the style guidelines.  I
guess we should just aim for consistency.  A quick 'grep' tells me that we're
pretty far from that goal.  :(

 
   // Returns whether or not this instance supports ack tracking.  This will
   // depend on whether or not the source of invaliadations supports
@@ -113,7 +116,10 @@ class INVALIDATION_EXPORT Invalidation {
 
   // A locally generated unique ID used to manage local acknowledgements.
   AckHandle ack_handle_;
-  syncer::WeakHandle<AckHandler> ack_handler_;
+
+  // The acknowledgement tracking handler and its thread.
+  base::WeakPtr<AckHandler> ack_handler_;
+  scoped_refptr<base::SequencedTaskRunner> ack_handler_task_runner_;
 };
 
 }  // namespace syncer