[Sync] Make InvalidationNotifier use PushClient

sync/notifier/chrome_invalidation_client_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 <string>
 
 #include "base/message_loop.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/v2/types.pb.h"
-#include "jingle/notifier/base/fake_base_task.h"
+#include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/state_writer.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 {
 
@@ skipping 34 matching lines @@
 
 class MockStateWriter : public StateWriter {
  public:
   MOCK_METHOD1(WriteState, void(const std::string&));
 };
 
 }  // namespace
 
 class ChromeInvalidationClientTest : public testing::Test {
  protected:
+  ChromeInvalidationClientTest()
+      : client_(
+          scoped_ptr<notifier::PushClient>(
+              new notifier::FakePushClient())) {}
+
   virtual void SetUp() {
     client_.Start(kClientId, kClientInfo, kState,
                   InvalidationVersionMap(),
                   browser_sync::MakeWeakHandle(
                       mock_invalidation_state_tracker_.AsWeakPtr()),
-                  &mock_listener_, &mock_state_writer_,
-                  fake_base_task_.AsWeakPtr());
+                  &mock_listener_, &mock_state_writer_);
   }
 
   virtual void TearDown() {
     // client_.Stop() stops the invalidation scheduler, which deletes any
     // pending tasks without running them.  Some tasks "run and delete" another
     // task, so they must be run in order to avoid leaking the inner task.
     // client_.Stop() does not schedule any tasks, so it's both necessary and
     // sufficient to drain the task queue before calling it.
     message_loop_.RunAllPending();
     client_.Stop();
@@ skipping 35 matching lines @@
     EXPECT_CALL(mock_invalidation_client_, Acknowledge(ack_handle));
     client_.InvalidateAll(&mock_invalidation_client_, ack_handle);
   }
 
   MessageLoop message_loop_;
   StrictMock<MockListener> mock_listener_;
   StrictMock<MockInvalidationStateTracker>
       mock_invalidation_state_tracker_;
   StrictMock<MockStateWriter> mock_state_writer_;
   StrictMock<MockInvalidationClient> mock_invalidation_client_;
-  notifier::FakeBaseTask fake_base_task_;
   ChromeInvalidationClient client_;
 };
 
 namespace {
 
 syncable::ModelTypePayloadMap MakeMap(syncable::ModelType model_type,
                                       const std::string& payload) {
   syncable::ModelTypePayloadMap type_payloads;
   type_payloads[model_type] = payload;
   return type_payloads;
@@ skipping 127 matching lines @@
   // Registered types should be preserved across Stop/Start.
   TearDown();
   SetUp();
   EXPECT_CALL(mock_listener_, OnInvalidate(MakeMapFromSet(types, "")));
   FireInvalidateAll();
 }
 
 // TODO(akalin): Flesh out unit tests.
 
 }  // namespace sync_notifier