Revert 72685 - [SYNC] Refactor SyncSourceInfo and add support in chrome inval...

chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/notifier/chrome_invalidation_client.h"
 #include "chrome/browser/sync/notifier/state_writer.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_notifier {
 
 using ::testing::_;
 using ::testing::Return;
 
 class MockListener : public ChromeInvalidationClient::Listener {
  public:
-  MOCK_METHOD2(OnInvalidate, void(syncable::ModelType,
-                                  const std::string& payload));
+  MOCK_METHOD1(OnInvalidate, void(syncable::ModelType));
   MOCK_METHOD0(OnInvalidateAll, void());
 };
 
 class MockStateWriter : public StateWriter {
  public:
   MOCK_METHOD1(WriteState, void(const std::string&));
 };
 
 class MockInvalidationClient : public invalidation::InvalidationClient {
  public:
@@ skipping 57 matching lines @@
     notifier::FakeBaseTask fake_base_task2;
     client_.ChangeBaseTask(fake_base_task2.AsWeakPtr());
   }
 
   SimulateInformOutboundListener();
 }
 
 // TODO(akalin): Flesh out unit tests.
 
 }  // namespace sync_notifier