Merge 253787 "[GCM] Make sure GCM checkout logic is invoked when..."

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 36 matching lines @@
   virtual ~GCMClientImpl();
 
   // Overridden from GCMClient:
   virtual void Initialize(
       const checkin_proto::ChromeBuildProto& chrome_build_proto,
       const base::FilePath& store_path,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
       Delegate* delegate) OVERRIDE;
+  virtual void Load() OVERRIDE;
   virtual void CheckOut() OVERRIDE;
   virtual void Register(const std::string& app_id,
                         const std::string& cert,
                         const std::vector<std::string>& sender_ids) OVERRIDE;
   virtual void Unregister(const std::string& app_id) OVERRIDE;
   virtual void Send(const std::string& app_id,
                     const std::string& receiver_id,
                     const OutgoingMessage& message) OVERRIDE;
-  virtual bool IsReady() const OVERRIDE;
 
  private:
   // State representation of the GCMClient.
   enum State {
     // Uninitialized.
     UNINITIALIZED,
+    // Initialized,
+    INITIALIZED,
     // GCM store loading is in progress.
     LOADING,
     // Initial device checkin is in progress.
     INITIAL_DEVICE_CHECKIN,
     // Ready to accept requests.
     READY,
   };
 
   // The check-in info for the user. Returned by the server.
   struct GCM_EXPORT CheckinInfo {
@@ skipping 60 matching lines @@
   void SetDeviceCredentialsCallback(bool success);
 
   // Completes the registration request.
   void OnRegisterCompleted(const std::string& app_id,
                            RegistrationRequest::Status status,
                            const std::string& registration_id);
 
   // Completes the unregistration request.
   void OnUnregisterCompleted(const std::string& app_id, bool status);
 
+  // Completes the GCM store destroy request.
+  void OnGCMStoreDestroyed(bool success);
+
   // Handles incoming data message and dispatches it the a relevant user
   // delegate.
   void HandleIncomingMessage(const gcm::MCSMessage& message);
 
   // Fires OnMessageSendError event on |delegate|, with specified |app_id| and
   // message ID obtained from |incoming_message| if one is available.
   void NotifyDelegateOnMessageSendError(
       GCMClient::Delegate* delegate,
       const std::string& app_id,
       const IncomingMessage& incoming_message);
@@ skipping 46 matching lines @@
 
   // 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_