Reduce dependency of TiclInvalidationService on Profile

sync/notifier/invalidation_notifier_unittest.cc

Index: sync/notifier/invalidation_notifier_unittest.cc
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 223fb28239b1b26f5fc51d56b38c5b9cd060bc0c..124ef669795657b87209c94b67ed832fc9c72633 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -5,13 +5,13 @@
 #include "sync/notifier/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_state_tracker.h"
@@ -31,24 +31,25 @@ class InvalidationNotifierTestDelegate {
     DestroyInvalidator();
   }
 
-  void CreateInvalidator(
-      const std::string& invalidator_client_id,
-      const std::string& initial_state,
-      const base::WeakPtr<InvalidationStateTracker>&
-          invalidation_state_tracker) {
-    DCHECK(!invalidator_.get());
+  void CreateInvalidator(const std::string& invalidator_client_id,
+                         const std::string& initial_state,
+                         InvalidationStateTracker* invalidation_state_tracker) {
+    DCHECK(!invalidator_);
+    invalidation_state_tracker_weak_ptr_factory_.reset(
+        new base::WeakPtrFactory<InvalidationStateTracker>(
+            invalidation_state_tracker));
     scoped_ptr<notifier::PushClient> push_client(
         new notifier::FakePushClient());
     scoped_ptr<SyncNetworkChannel> network_channel(
         new PushClientChannel(push_client.Pass()));
-    invalidator_.reset(
-        new InvalidationNotifier(
-            network_channel.Pass(),
-            invalidator_client_id,
-            UnackedInvalidationsMap(),
-            initial_state,
-            MakeWeakHandle(invalidation_state_tracker),
-            "fake_client_info"));
+    invalidator_.reset(new InvalidationNotifier(
+        network_channel.Pass(),
+        invalidator_client_id,
+        UnackedInvalidationsMap(),
+        initial_state,
+        MakeWeakHandle(
+            invalidation_state_tracker_weak_ptr_factory_->GetWeakPtr()),
+        "fake_client_info"));
   }
 
   Invalidator* GetInvalidator() {
@@ -81,6 +82,9 @@ class InvalidationNotifierTestDelegate {
  private:
   base::MessageLoop message_loop_;
   scoped_ptr<InvalidationNotifier> invalidator_;
+
+  scoped_ptr<base::WeakPtrFactory<InvalidationStateTracker> >
+      invalidation_state_tracker_weak_ptr_factory_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(