[GCM] Stop/restart GCM when the state is forced off/on

google_apis/gcm/gcm_client_impl.cc

 // 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.
 
 #include "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 268 matching lines @@
       // TODO(fgorski): Reset the checkin timer.
     }
   }
 }
 
 void GCMClientImpl::SetDeviceCredentialsCallback(bool success) {
   // TODO(fgorski): This is one of the signals that store needs a rebuild.
   DCHECK(success);
 }
 
-void GCMClientImpl::CheckOut() {
+void GCMClientImpl::Stop() {
   device_checkin_info_.Reset();
   mcs_client_.reset();
-  gcm_store_->Destroy(base::Bind(&GCMClientImpl::OnGCMStoreDestroyed,
-                                 weak_ptr_factory_.GetWeakPtr()));
   checkin_request_.reset();
   pending_registrations_.clear();
   state_ = INITIALIZED;
+  gcm_store_->Close();
+}
+
+void GCMClientImpl::CheckOut() {
+  Stop();
+  gcm_store_->Destroy(base::Bind(&GCMClientImpl::OnGCMStoreDestroyed,
+                                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void GCMClientImpl::Register(const std::string& app_id,
                              const std::string& cert,
                              const std::vector<std::string>& sender_ids) {
   DCHECK_EQ(state_, READY);
   RegistrationRequest::RequestInfo request_info(
       device_checkin_info_.android_id,
       device_checkin_info_.secret,
       app_id,
@@ skipping 198 matching lines @@
   if (iter != incoming_message.data.end())
     message_id = iter->second;
   delegate->OnMessageSendError(app_id, message_id, SERVER_ERROR);
 }
 
 void GCMClientImpl::SetMCSClientForTesting(scoped_ptr<MCSClient> mcs_client) {
   mcs_client_ = mcs_client.Pass();
 }
 
 }  // namespace gcm