Remove WeakHandle from components/invalidation

components/invalidation/invalidation_notifier.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/invalidation_notifier.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "components/invalidation/invalidation_handler.h"
 #include "google/cacheinvalidation/include/invalidation-client-factory.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace syncer {
 
 InvalidationNotifier::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)
     : state_(STOPPED),
       saved_invalidations_(saved_invalidations),
       invalidation_state_tracker_(invalidation_state_tracker),
+      invalidation_state_tracker_task_runner_(
+          invalidation_state_tracker_task_runner),
       client_info_(client_info),
       invalidator_client_id_(invalidator_client_id),
       invalidation_bootstrap_data_(invalidation_bootstrap_data),
       invalidation_listener_(network_channel.Pass()) {
 }
 
 InvalidationNotifier::~InvalidationNotifier() {
   DCHECK(CalledOnValidThread());
 }
 
@@ skipping 17 matching lines @@
 InvalidatorState InvalidationNotifier::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
   return registrar_.GetInvalidatorState();
 }
 
 void InvalidationNotifier::UpdateCredentials(
     const std::string& email, const std::string& token) {
   if (state_ == STOPPED) {
     invalidation_listener_.Start(
         base::Bind(&invalidation::CreateInvalidationClient),
-        invalidator_client_id_, client_info_, invalidation_bootstrap_data_,
+        invalidator_client_id_,
+        client_info_,
+        invalidation_bootstrap_data_,
         saved_invalidations_,
         invalidation_state_tracker_,
+        invalidation_state_tracker_task_runner_,
         this);
     state_ = STARTED;
   }
   invalidation_listener_.UpdateCredentials(email, token);
 }
 
 void InvalidationNotifier::RequestDetailedStatus(
     base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(CalledOnValidThread());
   invalidation_listener_.RequestDetailedStatus(callback);
 }
 
 void InvalidationNotifier::OnInvalidate(
     const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(CalledOnValidThread());
   registrar_.DispatchInvalidationsToHandlers(invalidation_map);
 }
 
 void InvalidationNotifier::OnInvalidatorStateChange(InvalidatorState state) {
   DCHECK(CalledOnValidThread());
   registrar_.UpdateInvalidatorState(state);
 }
 
 }  // namespace syncer