Remove associated keying material when unregistering from GCM

components/gcm_driver/gcm_driver.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 91 matching lines @@
   // instead multiple simultaneous registrations are allowed.
   // |app_id|: application ID.
   // |sender_ids|: list of IDs of the servers that are allowed to send the
   //               messages to the application. These IDs are assigned by the
   //               Google API Console.
   // |callback|: to be called once the asynchronous operation is done.
   void Register(const std::string& app_id,
                 const std::vector<std::string>& sender_ids,
                 const RegisterCallback& callback);
 
-  // Unregisters all sender_ids for an app. Only works on non-Android.
+  // Unregisters all sender_ids for an app. Only works on non-Android. Will also
+  // remove any encryption keys associated with the |app_id|.
   // |app_id|: application ID.
   // |callback|: to be called once the asynchronous operation is done.
   void Unregister(const std::string& app_id,
                   const UnregisterCallback& callback);
 
   // Unregisters an (app_id, sender_id) pair from using GCM. Only works on
-  // Android.
+  // Android. Will also remove any encryption keys associated with the |app_id|.
   // TODO(jianli): Switch to using GCM's unsubscribe API.
   // |app_id|: application ID.
   // |sender_id|: the sender ID that was passed when registering.
   // |callback|: to be called once the asynchronous operation is done.
   void UnregisterWithSenderId(const std::string& app_id,
                               const std::string& sender_id,
                               const UnregisterCallback& callback);
 
   // Sends a message to a given receiver.
   // |app_id|: application ID.
@@ skipping 129 matching lines @@
   // Platform-specific implementation of recording message decryption failures.
   virtual void RecordDecryptionFailure(
       const std::string& app_id,
       GCMEncryptionProvider::DecryptionFailure reason) = 0;
 
   // Runs the Register callback.
   void RegisterFinished(const std::string& app_id,
                         const std::string& registration_id,
                         GCMClient::Result result);
 
+  // To be called when a registration for |app_id| has been unregistered, having
+  // |result| as the result of the unregistration. Will remove any encryption
+  // information associated with the |app_id| and then calls UnregisterFinished.
+  void UnregisterRemoveEncryptionInfo(const std::string& app_id,

[Nicolas Zea, 2016/02/16 22:59:22]

nit: maybe rename to RemoveEncryptionInfoAfterUnregister?

[Peter Beverloo, 2016/02/17 10:20:24]

Done.

+                                      GCMClient::Result result);
+
   // Runs the Unregister callback.
-  void UnregisterFinished(const std::string& app_id,
-                          GCMClient::Result result);
+  void UnregisterFinished(const std::string& app_id, GCMClient::Result result);
 
   // Runs the Send callback.
   void SendFinished(const std::string& app_id,
                     const std::string& message_id,
                     GCMClient::Result result);
 
   bool HasRegisterCallback(const std::string& app_id);
 
   void ClearCallbacks();
 
@@ skipping 39 matching lines @@
   DefaultGCMAppHandler default_app_handler_;
 
   base::WeakPtrFactory<GCMDriver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriver);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_