Push API: Validate storage before returning cached subscriptions

components/gcm_driver/gcm_driver.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_driver.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 
 namespace gcm {
 
-namespace {
-
-const size_t kMaxSenders = 100;
-
-}  // namespace
-
 InstanceIDHandler::InstanceIDHandler() {
 }
 
 InstanceIDHandler::~InstanceIDHandler() {
 }
 
 void InstanceIDHandler::DeleteAllTokensForApp(
     const std::string& app_id, const DeleteTokenCallback& callback) {
   DeleteToken(app_id, "*", "*", callback);
 }
 
+const size_t GCMDriver::kMaxSenders = 100;
+
 GCMDriver::GCMDriver(
     const base::FilePath& store_path,
     const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner)
     : weak_ptr_factory_(this) {
   // The |blocking_task_runner| can be NULL for tests that do not need the
   // encryption capabilities of the GCMDriver class.
   if (blocking_task_runner)
     encryption_provider_.Init(store_path, blocking_task_runner);
 }
 
@@ skipping 270 matching lines @@
     GCMClient::Result result) {
   // Invoke the original unregister callback.
   unregister_callback.Run(result);
 
   // Trigger the pending registration.
   DCHECK(register_callbacks_.find(app_id) != register_callbacks_.end());
   RegisterImpl(app_id, normalized_sender_ids);
 }
 
 }  // namespace gcm