Remove WeakHandle from components/invalidation

components/invalidation/unacked_invalidation_set.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.
 
 #ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 #define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 
 #include <set>
 
+#include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_export.h"
 #include "components/invalidation/invalidation_util.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace syncer {
 
 namespace test_util {
 class UnackedInvalidationSetEqMatcher;
 }  // test_util
@@ skipping 22 matching lines @@
   // Adds many new invalidations to the set awaiting acknowledgement.
   void AddSet(const SingleObjectInvalidationSet& invalidations);
 
   // Exports the set of invalidations awaiting acknowledgement as an
   // ObjectIdInvalidationMap.  Each of these invalidations will be associated
   // with the given |ack_handler|.
   //
   // The contents of the UnackedInvalidationSet are not directly modified by
   // this procedure, but the AckHandles stored in those exported invalidations
   // are likely to end up back here in calls to Acknowledge() or Drop().
-  void ExportInvalidations(WeakHandle<AckHandler> ack_handler,
-                           ObjectIdInvalidationMap* out) const;
+  void ExportInvalidations(
+      base::WeakPtr<AckHandler> ack_handler,
+      scoped_refptr<base::SingleThreadTaskRunner> ack_handler_task_runner,
+      ObjectIdInvalidationMap* out) const;
 
   // Removes all stored invalidations from this object.
   void Clear();
 
   // Indicates that a handler has registered to handle these invalidations.
   //
   // Registrations with the invalidations server persist across restarts, but
   // registrations from InvalidationHandlers to the InvalidationService are not.
   // In the time immediately after a restart, it's possible that the server
   // will send us invalidations, and we won't have a handler to send them to.
@@ skipping 41 matching lines @@
   InvalidationsSet invalidations_;
 };
 
 typedef std::map<invalidation::ObjectId,
                  UnackedInvalidationSet,
                  ObjectIdLessThan> UnackedInvalidationsMap;
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_