Reduce dependency of TiclInvalidationService on Profile

sync/notifier/non_blocking_invalidator.cc

Index: sync/notifier/non_blocking_invalidator.cc
diff --git a/sync/notifier/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc
index db8d018f8bc75224b1dbdf7207558db2051b1629..55c30e2da9260a0d31945734fcde26a8a2185be6 100644
--- a/sync/notifier/non_blocking_invalidator.cc
+++ b/sync/notifier/non_blocking_invalidator.cc
@@ -13,6 +13,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "jingle/notifier/listener/push_client.h"
+#include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidation_notifier.h"
 #include "sync/notifier/object_id_invalidation_map.h"
@@ -206,12 +207,12 @@ NonBlockingInvalidator::NonBlockingInvalidator(
     const std::string& invalidator_client_id,
     const UnackedInvalidationsMap& saved_invalidations,
     const std::string& invalidation_bootstrap_data,
-    const WeakHandle<InvalidationStateTracker>&
-        invalidation_state_tracker,
+    InvalidationStateTracker* invalidation_state_tracker,
     const std::string& client_info,
     const scoped_refptr<net::URLRequestContextGetter>& request_context_getter)
     : parent_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       network_task_runner_(request_context_getter->GetNetworkTaskRunner()),
+      invalidation_state_tracker_weak_ptr_factory_(invalidation_state_tracker),
       weak_ptr_factory_(this) {
   core_ = new Core(MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()));
 
@@ -220,7 +221,7 @@ NonBlockingInvalidator::NonBlockingInvalidator(
       invalidator_client_id,
       saved_invalidations,
       invalidation_bootstrap_data,
-      invalidation_state_tracker,
+      MakeWeakHandle(invalidation_state_tracker_weak_ptr_factory_.GetWeakPtr()),

[Nicolas Zea, 2014/04/15 16:30:42]

I don't think this is necessary. Instead just have any messages to the state
tracker go through the NonBlockingInvalidator (bound the response lifetime to a
weak ptr vended internally by the NonBlockingInvalidator).

Because the lifetime of the state tracker is guaranteed to outlive the
invalidator, there's no need for a weak pointer.

       client_info,
       request_context_getter);