Fix GCMKeyStore interleaved request handling

components/gcm_driver/crypto/gcm_key_store.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_
 #define COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 48 matching lines @@
   void RemoveKeys(const std::string& app_id, const base::Closure& callback);
 
  private:
   // Initializes the database if necessary, and runs |done_closure| when done.
   void LazyInitialize(const base::Closure& done_closure);
 
   void DidInitialize(bool success);
   void DidLoadKeys(bool success,
                    std::unique_ptr<std::vector<EncryptionData>> entries);
 
-  void DidStoreKeys(const std::string& app_id,
-                    const KeyPair& pair,
+  void DidStoreKeys(const KeyPair& pair,
                     const std::string& auth_secret,
                     const KeysCallback& callback,
                     bool success);
 
-  void DidRemoveKeys(const std::string& app_id,
-                     const base::Closure& callback,
-                     bool success);
+  void DidRemoveKeys(const base::Closure& callback, bool success);
 
   // Private implementations of the API that will be executed when the database
   // has either been successfully loaded, or failed to load.
 
   void GetKeysAfterInitialize(const std::string& app_id,
                               const KeysCallback& callback);
   void CreateKeysAfterInitialize(const std::string& app_id,
                                  const KeysCallback& callback);
   void RemoveKeysAfterInitialize(const std::string& app_id,
                                  const base::Closure& callback);
@@ skipping 22 matching lines @@
   std::map<std::string, std::string> auth_secrets_;
 
   base::WeakPtrFactory<GCMKeyStore> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMKeyStore);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_