Reduce dependency of TiclInvalidationService on Profile

sync/notifier/non_blocking_invalidator_unittest.cc

 // Copyright (c) 2012 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 "sync/notifier/non_blocking_invalidator.h"
 
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidator_test_template.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class NonBlockingInvalidatorTestDelegate {
  public:
   NonBlockingInvalidatorTestDelegate() : io_thread_("IO thread") {}
 
   ~NonBlockingInvalidatorTestDelegate() {
     DestroyInvalidator();
   }
 
   void CreateInvalidator(
       const std::string& invalidator_client_id,
       const std::string& initial_state,
-      const base::WeakPtr<InvalidationStateTracker>&
-          invalidation_state_tracker) {
+      InvalidationStateTracker* invalidation_state_tracker) {
     DCHECK(!invalidator_.get());
     base::Thread::Options options;
     options.message_loop_type = base::MessageLoop::TYPE_IO;
     io_thread_.StartWithOptions(options);
     request_context_getter_ =
         new net::TestURLRequestContextGetter(io_thread_.message_loop_proxy());
     notifier::NotifierOptions notifier_options;
     notifier_options.request_context_getter = request_context_getter_;
     NetworkChannelCreator network_channel_creator =
         NonBlockingInvalidator::MakePushClientChannelCreator(notifier_options);
     invalidator_.reset(
         new NonBlockingInvalidator(
             network_channel_creator,
             invalidator_client_id,
             UnackedInvalidationsMap(),
             initial_state,
-            MakeWeakHandle(invalidation_state_tracker),
+            invalidation_state_tracker,
             "fake_client_info",
             request_context_getter_));
   }
 
   Invalidator* GetInvalidator() {
     return invalidator_.get();
   }
 
   void DestroyInvalidator() {
     invalidator_.reset();
@@ skipping 28 matching lines @@
   scoped_ptr<NonBlockingInvalidator> invalidator_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     NonBlockingInvalidatorTest, InvalidatorTest,
     NonBlockingInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer