[GCM] Move registration info persistence from extension state store to GCM store

chrome/browser/services/gcm/gcm_profile_service.h

Index: chrome/browser/services/gcm/gcm_profile_service.h
diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
index 672fccc5e4c286c3ac2ca5e44de647d69472ee28..75eefe659049985d7dac4b7d80c6f5eb2f6f08e1 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.h
+++ b/chrome/browser/services/gcm/gcm_profile_service.h
@@ -135,15 +135,6 @@ class GCMProfileService : public KeyedService,
   class DelayedTaskController;
   class IOWorker;
 
-  struct RegistrationInfo {
-    RegistrationInfo();
-    ~RegistrationInfo();
-    bool IsValid() const;
-
-    std::vector<std::string> sender_ids;
-    std::string registration_id;
-  };
-
   typedef std::map<std::string, GCMAppHandler*> GCMAppHandlerMap;
 
   // Overridden from content::NotificationObserver:
@@ -160,9 +151,8 @@ class GCMProfileService : public KeyedService,
   // the profile was signed in.
   void EnsureLoaded();
 
-  // Remove cached or persisted data when GCM service is stopped.
+  // Remove cached data when GCM service is stopped.
   void RemoveCachedData();
-  void RemovePersistedData();
 
   // Checks out of GCM when the profile has been signed out. This will erase
   // all the cached and persisted data.
@@ -204,24 +194,8 @@ class GCMProfileService : public KeyedService,
   // Returns the handler for the given app.
   GCMAppHandler* GetAppHandler(const std::string& app_id);
 
-  // Used to persist the IDs of registered apps.
-  void ReadRegisteredAppIDs();
-  void WriteRegisteredAppIDs();
-
-  // Used to persist registration info into the app's state store.
-  void DeleteRegistrationInfo(const std::string& app_id);
-  void WriteRegistrationInfo(const std::string& app_id);
-  void ReadRegistrationInfo(const std::string& app_id);
-  void ReadRegistrationInfoFinished(const std::string& app_id,
-                                    scoped_ptr<base::Value> value);
-  bool ParsePersistedRegistrationInfo(scoped_ptr<base::Value> value,
-                                      RegistrationInfo* registration_info);
   void RequestGCMStatisticsFinished(GCMClient::GCMStatistics stats);
 
-  // Returns the key used to identify the registration info saved into the
-  // app's state store. Used for testing purpose.
-  static const char* GetPersistentRegisterKeyForTesting();
-
   // The profile which owns this object.
   Profile* profile_;
 
@@ -257,10 +231,6 @@ class GCMProfileService : public KeyedService,
   // Callback for RequestGCMStatistics.
   RequestGCMStatisticsCallback request_gcm_statistics_callback_;
 
-  // Map from app_id to registration info (sender ids & registration ID).
-  typedef std::map<std::string, RegistrationInfo> RegistrationInfoMap;
-  RegistrationInfoMap registration_info_map_;
-
   // Used to pass a weak pointer to the IO worker.
   base::WeakPtrFactory<GCMProfileService> weak_ptr_factory_;