Revert r148496 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"

sync/notifier/chrome_invalidation_client.h

 // 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.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 
+#include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/chrome_system_resources.h"
 #include "sync/notifier/invalidation_state_tracker.h"
+#include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/notifications_disabled_reason.h"
-#include "sync/notifier/object_id_payload_map.h"
 #include "sync/notifier/state_writer.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 class RegistrationManager;
 
+typedef std::map<invalidation::ObjectId,
+                 std::string,
+                 ObjectIdLessThan> ObjectIdPayloadMap;
+
 // ChromeInvalidationClient is not thread-safe and lives on the sync
 // thread.
 class ChromeInvalidationClient
     : public invalidation::InvalidationListener,
       public StateWriter,
       public notifier::PushClientObserver,
       public base::NonThreadSafe {
  public:
   class Listener {
    public:
@@ skipping 95 matching lines @@
   // NO_NOTIFICATION_ERROR meaning notifications are enabled).
   NotificationsDisabledReason ticl_state_;
   NotificationsDisabledReason push_client_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_