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

chrome/browser/services/gcm/gcm_profile_service.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 117 matching lines @@
   // Get GCM client internal states and statistics. If it has not been created
   // then stats won't be modified.
   void RequestGCMStatistics(RequestGCMStatisticsCallback callback);
 
  private:
   friend class GCMProfileServiceTestConsumer;
 
   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:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from SigninManagerBase::Observer:
   virtual void GoogleSigninSucceeded(const std::string& username,
                                      const std::string& password) OVERRIDE;
   virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
 
   // Ensures that the GCMClient is loaded and the GCM check-in is done when
   // 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.
   void CheckOut();
 
   // Resets the GCMClient instance. This is called when the profile is being
   // destroyed.
   void ResetGCMClient();
 
   // Ensures that the app is ready for GCM functions and events.
@@ skipping 21 matching lines @@
   void MessageReceived(const std::string& app_id,
                        GCMClient::IncomingMessage message);
   void MessagesDeleted(const std::string& app_id);
   void MessageSendError(const std::string& app_id,
                         const GCMClient::SendErrorDetails& send_error_details);
   void GCMClientReady();
 
   // 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_;
 
   // Flag to indicate if GCMClient is ready.
   bool gcm_client_ready_;
 
   // The username of the signed-in profile.
   std::string username_;
 
   content::NotificationRegistrar registrar_;
@@ skipping 15 matching lines @@
 
   // Callback map (from app_id to callback) for Unregister.
   std::map<std::string, UnregisterCallback> unregister_callbacks_;
 
   // Callback map (from <app_id, message_id> to callback) for Send.
   std::map<std::pair<std::string, std::string>, SendCallback> send_callbacks_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_