Push API: Validate storage before returning cached subscriptions

components/gcm_driver/instance_id/instance_id_impl.cc

 // Copyright 2015 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/instance_id/instance_id_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 116 matching lines @@
     const std::string& scope,
     const std::map<std::string, std::string>& options,
     const GetTokenCallback& callback) {
   EnsureIDGenerated();
 
   Handler()->GetToken(app_id(), authorized_entity, scope, options,
                       base::Bind(&InstanceIDImpl::OnGetTokenCompleted,
                                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
+void InstanceIDImpl::ValidateToken(const std::string& authorized_entity,
+                                   const std::string& scope,
+                                   const std::string& token,
+                                   const ValidateTokenCallback& callback) {
+  DCHECK(!authorized_entity.empty());
+  DCHECK(!scope.empty());
+  DCHECK(!token.empty());
+
+  if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
+    delayed_task_controller_.AddTask(base::Bind(
+        &InstanceIDImpl::DoValidateToken, weak_ptr_factory_.GetWeakPtr(),
+        authorized_entity, scope, token, callback));
+    return;
+  }
+
+  DoValidateToken(authorized_entity, scope, token, callback);
+}
+
+void InstanceIDImpl::DoValidateToken(const std::string& authorized_entity,
+                                     const std::string& scope,
+                                     const std::string& token,
+                                     const ValidateTokenCallback& callback) {
+  if (id_.empty()) {
+    callback.Run(false /* is_valid */);

[Peter Beverloo, 2017/03/20 23:50:13]

nit: this potentially is a synchronous return path. Should we post a task
instead?

[johnme, 2017/03/30 18:36:38]

The convention in this file seems to be for synchronous running of callbacks. I
agree that it's a little odd. How about I change them all in a follow-up patch?

+    return;
+  }
+
+  Handler()->ValidateToken(app_id(), authorized_entity, scope, token, callback);
+}
+
 void InstanceIDImpl::DeleteTokenImpl(const std::string& authorized_entity,
                                      const std::string& scope,
                                      const DeleteTokenCallback& callback) {
   DCHECK(!authorized_entity.empty());
   DCHECK(!scope.empty());
 
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
     delayed_task_controller_.AddTask(
         base::Bind(&InstanceIDImpl::DoDeleteToken,
                    weak_ptr_factory_.GetWeakPtr(),
@@ skipping 122 matching lines @@
 }
 
 gcm::InstanceIDHandler* InstanceIDImpl::Handler() {
   gcm::InstanceIDHandler* handler =
       gcm_driver()->GetInstanceIDHandlerInternal();
   DCHECK(handler);
   return handler;
 }
 
 }  // namespace instance_id