Implement new invalidations ack tracking system

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/command_line.h"
@@ skipping 10 matching lines @@
 #include "net/base/network_change_notifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/transport_security_state.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/non_blocking_invalidator.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/tools/null_invalidation_state_tracker.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 {
@@ skipping 134 matching lines @@
   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;
   scoped_ptr<Invalidator> invalidator(
       new NonBlockingInvalidator(
           notifier_options,
           base::RandBytesAsString(8),
-          null_invalidation_state_tracker.GetAllInvalidationStates(),
+          null_invalidation_state_tracker.GetSavedInvalidations(),
           null_invalidation_state_tracker.GetBootstrapData(),
           WeakHandle<InvalidationStateTracker>(
               null_invalidation_state_tracker.AsWeakPtr()),
           kClientInfo));
 
   NotificationPrinter notification_printer;
 
   invalidator->UpdateCredentials(email, token);
 
   // Listen for notifications for all known types.
   invalidator->RegisterHandler(&notification_printer);
   invalidator->UpdateRegisteredIds(
       &notification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
 
   ui_loop.Run();
 
   invalidator->UnregisterHandler(&notification_printer);
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncListenNotificationsMain(argc, argv);
 }