Add support to GCMKeyStore for multiple keys per app_id

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>
 
@@ skipping 147 matching lines @@
   }
 
   send_callbacks_[key] = callback;
 
   SendImpl(app_id, receiver_id, message);
 }
 
 void GCMDriver::GetEncryptionInfo(
     const std::string& app_id,
     const GetEncryptionInfoCallback& callback) {
-  encryption_provider_.GetEncryptionInfo(app_id, callback);
+  encryption_provider_.GetEncryptionInfo(app_id, "" /* authorized_entity */,
+                                         callback);
 }
 
 void GCMDriver::UnregisterWithSenderIdImpl(const std::string& app_id,
                                            const std::string& sender_id) {
   NOTREACHED();
 }
 
 void GCMDriver::RegisterFinished(const std::string& app_id,
                                  const std::string& registration_id,
                                  GCMClient::Result result) {
   std::map<std::string, RegisterCallback>::iterator callback_iter =
       register_callbacks_.find(app_id);
   if (callback_iter == register_callbacks_.end()) {
     // The callback could have been removed when the app is uninstalled.
     return;
   }
 
   RegisterCallback callback = callback_iter->second;
   register_callbacks_.erase(callback_iter);
   callback.Run(registration_id, result);
 }
 
 void GCMDriver::RemoveEncryptionInfoAfterUnregister(const std::string& app_id,
                                                     GCMClient::Result result) {
   encryption_provider_.RemoveEncryptionInfo(
-      app_id, base::Bind(&GCMDriver::UnregisterFinished,
-                         weak_ptr_factory_.GetWeakPtr(), app_id, result));
+      app_id, "" /* authorized_entity */,
+      base::Bind(&GCMDriver::UnregisterFinished, weak_ptr_factory_.GetWeakPtr(),
+                 app_id, result));
 }
 
 void GCMDriver::UnregisterFinished(const std::string& app_id,
                                    GCMClient::Result result) {
   std::map<std::string, UnregisterCallback>::iterator callback_iter =
       unregister_callbacks_.find(app_id);
   if (callback_iter == unregister_callbacks_.end())
     return;
 
   UnregisterCallback callback = callback_iter->second;
@@ skipping 104 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