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

google_apis/gcm/gcm_client_impl.h

 // Copyright 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 GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 82 matching lines @@
     }
 
     uint64 android_id;
     uint64 secret;
   };
 
   // Collection of pending registration requests. Keys are app IDs, while values
   // are pending registration requests to obtain a registration ID for
   // requesting application.
   typedef std::map<std::string, RegistrationRequest*>
-      PendingRegistrations;
+      PendingRegistrationRequests;
 
   // Collection of pending unregistration requests. Keys are app IDs, while
   // values are pending unregistration requests to disable the registration ID
   // currently assigned to the application.
   typedef std::map<std::string, UnregistrationRequest*>
-      PendingUnregistrations;
+      PendingUnregistrationRequests;
 
   friend class GCMClientImplTest;
 
   // Returns text representation of the enum State.
   std::string GetStateString() const;
 
   // Callbacks for the MCSClient.
   // Receives messages and dispatches them to relevant user delegates.
   void OnMessageReceivedFromMCS(const gcm::MCSMessage& message);
   // Receives confirmation of sent messages or information about errors.
@@ skipping 23 matching lines @@
   void StartCheckin(const CheckinInfo& checkin_info);
   // Completes the device checkin request.
   // |android_id| and |security_token| are expected to be non-zero or an error
   // is triggered. Function also cleans up the pending checkin.
   void OnCheckinCompleted(uint64 android_id,
                           uint64 security_token);
 
   // Callback for persisting device credentials in the |gcm_store_|.
   void SetDeviceCredentialsCallback(bool success);
 
+  // Callback for persisting registration info in the |gcm_store_|.
+  void UpdateRegistrationCallback(bool success);
+
   // Completes the registration request.
   void OnRegisterCompleted(const std::string& app_id,
+                           const std::vector<std::string>& sender_ids,
                            RegistrationRequest::Status status,
                            const std::string& registration_id);
 
   // Completes the unregistration request.
   void OnUnregisterCompleted(const std::string& app_id,
                              UnregistrationRequest::Status status);
 
   // Completes the GCM store destroy request.
   void OnGCMStoreDestroyed(bool success);
 
@@ skipping 42 matching lines @@
   net::BoundNetLog net_log_;
   scoped_ptr<ConnectionFactory> connection_factory_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
   // Controls receiving and sending of packets and reliable message queueing.
   scoped_ptr<MCSClient> mcs_client_;
 
   scoped_ptr<CheckinRequest> checkin_request_;
   std::vector<std::string> account_ids_;
 
-  // Currently pending registrations. GCMClientImpl owns the
+  // Cached registration info.
+  RegistrationInfoMap registrations_;
+
+  // Currently pending registration requests. GCMClientImpl owns the
   // RegistrationRequests.
-  PendingRegistrations pending_registrations_;
-  STLValueDeleter<PendingRegistrations> pending_registrations_deleter_;
+  PendingRegistrationRequests pending_registration_requests_;
+  STLValueDeleter<PendingRegistrationRequests>
+      pending_registration_requests_deleter_;
 
-  // Currently pending unregistrations. GCMClientImpl owns the
+  // Currently pending unregistration requests. GCMClientImpl owns the
   // UnregistrationRequests.
-  PendingUnregistrations pending_unregistrations_;
-  STLValueDeleter<PendingUnregistrations> pending_unregistrations_deleter_;
+  PendingUnregistrationRequests pending_unregistration_requests_;
+  STLValueDeleter<PendingUnregistrationRequests>
+      pending_unregistration_requests_deleter_;
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_