[Sync] Make InvalidationNotifier use PushClient

sync/notifier/invalidation_notifier_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/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/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/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_notifier {
 
 namespace {
 
 using ::testing::InSequence;
 using ::testing::StrictMock;
 
 class InvalidationNotifierTest : public testing::Test {
  protected:
   virtual void SetUp() {
     notifier::NotifierOptions notifier_options;
     // Note: URLRequestContextGetters are ref-counted.
     notifier_options.request_context_getter =
         new TestURLRequestContextGetter(message_loop_.message_loop_proxy());
     invalidation_notifier_.reset(
         new InvalidationNotifier(
-            notifier_options,
+            scoped_ptr<notifier::PushClient>(new notifier::FakePushClient()),
             InvalidationVersionMap(),
             browser_sync::MakeWeakHandle(
                 base::WeakPtr<InvalidationStateTracker>()),
             "fake_client_info"));
     invalidation_notifier_->AddObserver(&mock_observer_);
   }
 
   virtual void TearDown() {
     invalidation_notifier_->RemoveObserver(&mock_observer_);
     // Stopping the invalidation notifier stops its scheduler, which deletes any
@@ skipping 29 matching lines @@
   EXPECT_CALL(mock_observer_, StoreState("new_fake_state"));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(type_payloads,
                                      REMOTE_NOTIFICATION));
   EXPECT_CALL(mock_observer_, OnNotificationStateChange(false));
 
   invalidation_notifier_->SetState("fake_state");
   invalidation_notifier_->SetUniqueId("fake_id");
   invalidation_notifier_->UpdateCredentials("foo@bar.com", "fake_token");
 
-  invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr());
   invalidation_notifier_->OnSessionStatusChanged(true);
 
   invalidation_notifier_->WriteState("new_fake_state");
 
   invalidation_notifier_->OnInvalidate(type_payloads);
 
-  // Shouldn't trigger notification state change.
-  invalidation_notifier_->OnDisconnect();
-  invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr());
-
   invalidation_notifier_->OnSessionStatusChanged(false);
 }
 
 }  // namespace
 
 }  // namespace sync_notifier