Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_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 "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
 #include "chrome/browser/sync/invalidation_frontend.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::NotNull;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace extensions {
 
 namespace {
 
 class MockInvalidationFrontend : public InvalidationFrontend {
  public:
   MockInvalidationFrontend();
   ~MockInvalidationFrontend();
   MOCK_METHOD1(RegisterInvalidationHandler,
-               void(syncer::SyncNotifierObserver*));
+               void(syncer::InvalidationHandler*));
   MOCK_METHOD2(UpdateRegisteredInvalidationIds,
-               void(syncer::SyncNotifierObserver*, const syncer::ObjectIdSet&));
+               void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&));
   MOCK_METHOD1(UnregisterInvalidationHandler,
-               void(syncer::SyncNotifierObserver*));
+               void(syncer::InvalidationHandler*));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInvalidationFrontend);
 };
 
 MockInvalidationFrontend::MockInvalidationFrontend() {}
 MockInvalidationFrontend::~MockInvalidationFrontend() {}
 
 class MockInvalidationHandlerDelegate
     : public PushMessagingInvalidationHandlerDelegate {
@@ skipping 14 matching lines @@
 
 class PushMessagingInvalidationHandlerTest : public ::testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     SetUpWithArgs(std::set<std::string>(), syncer::ObjectIdSet());
   }
 
   virtual void SetUpWithArgs(const std::set<std::string>& extension_ids,
                              const syncer::ObjectIdSet& expected_ids) {
     InSequence seq;
-    syncer::SyncNotifierObserver* handler[2] = {};
+    syncer::InvalidationHandler* handler[2] = {};
     EXPECT_CALL(service_, RegisterInvalidationHandler(NotNull()))
         .WillOnce(SaveArg<0>(&handler[0]));
     EXPECT_CALL(service_,
                 UpdateRegisteredInvalidationIds(NotNull(), expected_ids))
         .WillOnce(SaveArg<0>(&handler[1]));
     handler_.reset(new PushMessagingInvalidationHandler(
         &service_, &delegate_, extension_ids));
     EXPECT_EQ(handler[0], handler[1]);
     EXPECT_EQ(handler_.get(), handler[0]);
 
@@ skipping 108 matching lines @@
       "U/dddddddddddddddddddddddddddddddd/z"));
   // Subchannel out of range.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/dddddddddddddddddddddddddddddddd/4"));
   handler_->OnIncomingNotification(ObjectIdSetToStateMap(ids, "payload"),
                                    syncer::REMOTE_NOTIFICATION);
 }
 
 }  // namespace extensions