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

google_apis/gcm/gcm_client.h

Index: google_apis/gcm/gcm_client.h
===================================================================
--- google_apis/gcm/gcm_client.h	(revision 255183)
+++ google_apis/gcm/gcm_client.h	(working copy)
@@ -132,7 +132,8 @@
   GCMClient();
   virtual ~GCMClient();
 
-  // Begins initialization of the GCM Client.
+  // Begins initialization of the GCM Client. This will not trigger a
+  // connection.
   // |chrome_build_proto|: chrome info, i.e., version, channel and etc.
   // |store_path|: path to the GCM store.
   // |blocking_task_runner|: for running blocking file tasks.
@@ -147,6 +148,10 @@
           url_request_context_getter,
       Delegate* delegate) = 0;
 
+  // Loads the data from the persistent store. This will automatically kick off
+  // the check-in if the check-in info is not found in the store.
+  virtual void Load() = 0;
+
   // Checks out of the GCM service. This will erase all the cached and persisted
   // data.
   virtual void CheckOut() = 0;
@@ -176,9 +181,6 @@
   virtual void Send(const std::string& app_id,
                     const std::string& receiver_id,
                     const OutgoingMessage& message) = 0;
-
-  // Returns true if GCM becomes ready.
-  virtual bool IsReady() const = 0;
 };
 
 }  // namespace gcm