[Sync] Make InvalidationNotifier use PushClient

sync/notifier/chrome_invalidation_client_unittest.cc

Index: sync/notifier/chrome_invalidation_client_unittest.cc
diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index 225eab6f162bcce343fd0f960d919269f347bbf3..624768316d95c94a7f09d529e1dfc1ff88c4e07c 100644
--- a/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -8,7 +8,7 @@
 #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"
@@ -63,13 +63,17 @@ class MockStateWriter : public StateWriter {
 
 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() {
@@ -125,7 +129,6 @@ class ChromeInvalidationClientTest : public testing::Test {
       mock_invalidation_state_tracker_;
   StrictMock<MockStateWriter> mock_state_writer_;
   StrictMock<MockInvalidationClient> mock_invalidation_client_;
-  notifier::FakeBaseTask fake_base_task_;
   ChromeInvalidationClient client_;
 };