Persist Instance ID data to GCM store.

components/gcm_driver/gcm_client_impl.cc

 // Copyright 2014 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 "components/gcm_driver/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 330 matching lines @@
   device_checkin_info_.last_checkin_accounts = result->last_checkin_accounts;
   // A case where there were previously no accounts reported with checkin is
   // considered to be the same as when the list of accounts is empty. It enables
   // scheduling a periodic checkin for devices with no signed in users
   // immediately after restart, while keeping |accounts_set == false| delays the
   // checkin until the list of accounts is set explicitly.
   if (result->last_checkin_accounts.size() == 0)
     device_checkin_info_.accounts_set = true;
   last_checkin_time_ = result->last_checkin_time;
   gservices_settings_.UpdateFromLoadResult(*result);
+  instance_id_data_ = result->instance_id_data;
   load_result_ = result.Pass();
   state_ = LOADED;
 
   // Don't initiate the GCM connection when GCM is in delayed start mode and
   // not any standalone app has registered GCM yet.
   if (start_mode_ == DELAYED_START && !HasStandaloneRegisteredApp())
     return;
 
   StartGCM();
 }
@@ skipping 162 matching lines @@
       time,
       base::Bind(&GCMClientImpl::IgnoreWriteResultCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void GCMClientImpl::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) {
   DCHECK(mcs_client_);
   mcs_client_->UpdateHeartbeatTimer(timer.Pass());
 }
 
+void GCMClientImpl::AddInstanceIDData(const std::string& app_id,
+                                      const std::string& instance_id_data) {

[fgorski, 2015/05/08 17:12:33]

Also add to the instance_id_data_

[jianli, 2015/05/08 20:56:01]

Done.

+  gcm_store_->AddInstanceIDData(
+      app_id,
+      instance_id_data,
+      base::Bind(&GCMClientImpl::IgnoreWriteResultCallback,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void GCMClientImpl::RemoveInstanceIDData(const std::string& app_id) {

[fgorski, 2015/05/08 17:12:33]

remove from instance ID data_

This and above could be one in a callback, once you know instance ID was
properly written... It will take a bit more work though.

[jianli, 2015/05/08 20:56:01]

Done.

+  gcm_store_->RemoveInstanceIDData(
+      app_id,
+      base::Bind(&GCMClientImpl::IgnoreWriteResultCallback,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+std::string GCMClientImpl::GetInstanceIDData(const std::string& app_id) {
+  auto iter = instance_id_data_.find(app_id);
+  if (iter == instance_id_data_.cend())
+    return std::string();
+  return iter->second;
+}
+
 void GCMClientImpl::StartCheckin() {
   // Make sure no checkin is in progress.
   if (checkin_request_.get())
     return;
 
   checkin_proto::ChromeBuildProto chrome_build_proto;
   ToCheckinProtoVersion(chrome_build_info_, &chrome_build_proto);
   CheckinRequest::RequestInfo request_info(device_checkin_info_.android_id,
                                            device_checkin_info_.secret,
                                            device_checkin_info_.account_tokens,
@@ skipping 516 matching lines @@
 bool GCMClientImpl::HasStandaloneRegisteredApp() const {
   if (registrations_.empty())
     return false;
   // Note that account mapper is not counted as a standalone app since it is
   // automatically started when other app uses GCM.
   return registrations_.size() > 1 ||
          !registrations_.count(kGCMAccountMapperAppId);
 }
 
 }  // namespace gcm