Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

sync/tools/sync_listen_notifications.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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/transport_security_state.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/notifier/invalidation_state_tracker.h"
+#include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/sync_notifier.h"
-#include "sync/notifier/sync_notifier_factory.h"
-#include "sync/notifier/sync_notifier_observer.h"
+#include "sync/notifier/invalidator_factory.h"
+#include "sync/notifier/invalidator.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 // This is a simple utility that initializes a sync notifier and
 // listens to any received notifications.
 
 namespace syncer {
 namespace {
 
 const char kEmailSwitch[] = "email";
 const char kTokenSwitch[] = "token";
 const char kHostPortSwitch[] = "host-port";
 const char kTrySslTcpFirstSwitch[] = "try-ssltcp-first";
 const char kAllowInsecureConnectionSwitch[] = "allow-insecure-connection";
 const char kNotificationMethodSwitch[] = "notification-method";
 
 // Class to print received notifications events.
-class NotificationPrinter : public SyncNotifierObserver {
+class NotificationPrinter : public InvalidationHandler {
  public:
   NotificationPrinter() {}
   virtual ~NotificationPrinter() {}
 
   virtual void OnNotificationsEnabled() OVERRIDE {
     LOG(INFO) << "Notifications enabled";
   }
 
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) OVERRIDE {
@@ skipping 163 matching lines @@
   // Set up objects that monitor the network.
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
       net::NetworkChangeNotifier::Create());
 
   const notifier::NotifierOptions& notifier_options =
       ParseNotifierOptions(
           command_line,
           new MyTestURLRequestContextGetter(io_thread.message_loop_proxy()));
   const char kClientInfo[] = "sync_listen_notifications";
   NullInvalidationStateTracker null_invalidation_state_tracker;
-  SyncNotifierFactory sync_notifier_factory(
+  InvalidatorFactory invalidator_factory(
       notifier_options, kClientInfo,
       null_invalidation_state_tracker.AsWeakPtr());
-  scoped_ptr<SyncNotifier> sync_notifier(
-      sync_notifier_factory.CreateSyncNotifier());
+  scoped_ptr<Invalidator> invalidator(
+      invalidator_factory.CreateInvalidator());
   NotificationPrinter notification_printer;
 
   const char kUniqueId[] = "fake_unique_id";
-  sync_notifier->SetUniqueId(kUniqueId);
-  sync_notifier->UpdateCredentials(email, token);
+  invalidator->SetUniqueId(kUniqueId);
+  invalidator->UpdateCredentials(email, token);
 
   // Listen for notifications for all known types.
-  sync_notifier->RegisterHandler(&notification_printer);
-  sync_notifier->UpdateRegisteredIds(
+  invalidator->RegisterHandler(&notification_printer);
+  invalidator->UpdateRegisteredIds(
       &notification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
 
   ui_loop.Run();
 
-  sync_notifier->UnregisterHandler(&notification_printer);
+  invalidator->UnregisterHandler(&notification_printer);
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncListenNotificationsMain(argc, argv);
 }