Remove WeakHandle from components/invalidation

components/invalidation/mock_ack_handler.cc

 // 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.
 
 #include "components/invalidation/mock_ack_handler.h"
 
+#include "base/message_loop/message_loop_proxy.h"
 #include "components/invalidation/ack_handle.h"
 #include "components/invalidation/invalidation.h"
 
 namespace syncer {
 
 namespace {
 
 struct AckHandleMatcher {
   AckHandleMatcher(const AckHandle& handle);
   bool operator()(const syncer::Invalidation& invalidation) const;
@@ skipping 10 matching lines @@
 }
 
 }  // namespace
 
 MockAckHandler::MockAckHandler() {}
 
 MockAckHandler::~MockAckHandler() {}
 
 void MockAckHandler::RegisterInvalidation(Invalidation* invalidation) {
   unacked_invalidations_.push_back(*invalidation);
-  invalidation->set_ack_handler(WeakHandleThis());
+  invalidation->SetAckHandler(AsWeakPtr(), base::MessageLoopProxy::current());
 }
 
 void MockAckHandler::RegisterUnsentInvalidation(Invalidation* invalidation) {
   unsent_invalidations_.push_back(*invalidation);
 }
 
 bool MockAckHandler::IsUnacked(const Invalidation& invalidation) const {
   AckHandleMatcher matcher(invalidation.ack_handle());
   InvalidationVector::const_iterator it = std::find_if(
       unacked_invalidations_.begin(),
@@ skipping 61 matching lines @@
       unacked_invalidations_.end(),
       matcher);
   if (it != unacked_invalidations_.end()) {
     dropped_invalidations_.push_back(*it);
     unacked_invalidations_.erase(it);
   }
   unrecovered_drop_events_.erase(id);
   unrecovered_drop_events_.insert(std::make_pair(id, handle));
 }
 
-WeakHandle<AckHandler> MockAckHandler::WeakHandleThis() {
-  return WeakHandle<AckHandler>(AsWeakPtr());
-}
-
 }  // namespace syncer