Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/chrome_invalidation_client.h

Index: sync/notifier/chrome_invalidation_client.h
diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index e4e5439ad81fa58dee2d697cc2335855948aa3d0..10e3523f8d9513e044c035403b17fb8d0bc9bb35 100644
--- a/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -8,7 +8,6 @@
 #ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 
-#include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ -21,8 +20,8 @@
 #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 {
@@ -37,10 +36,6 @@ 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