Integrate InstanceID with GCM crypto provider

components/gcm_driver/instance_id/instance_id.cc

Index: components/gcm_driver/instance_id/instance_id.cc
diff --git a/components/gcm_driver/instance_id/instance_id.cc b/components/gcm_driver/instance_id/instance_id.cc
index d48b5cafe34ccc49a9a48d04189cea834ccd4d55..8204ca65fdc011a14b7907383072316191f1e2f3 100644
--- a/components/gcm_driver/instance_id/instance_id.cc
+++ b/components/gcm_driver/instance_id/instance_id.cc
@@ -4,9 +4,15 @@
 
 #include "components/gcm_driver/instance_id/instance_id.h"
 
+#include "base/bind.h"
+#include "components/gcm_driver/gcm_driver.h"
+
 namespace instance_id {
 
-InstanceID::InstanceID(const std::string& app_id) : app_id_(app_id) {}
+const char kGCMScope[] = "GCM";
+
+InstanceID::InstanceID(const std::string& app_id, gcm::GCMDriver* gcm_driver)
+    : gcm_driver_(gcm_driver), app_id_(app_id), weak_ptr_factory_(this) {}
 
 InstanceID::~InstanceID() {}
 
@@ -19,4 +25,35 @@ void InstanceID::NotifyTokenRefresh(bool update_id) {
     token_refresh_callback_.Run(app_id_, update_id);
 }
 
+void InstanceID::GetEncryptionInfo(const std::string& authorized_entity,
+                                   const GetEncryptionInfoCallback& callback) {
+  gcm_driver_->encryption_provider_internal()->GetEncryptionInfo(
+      app_id_, authorized_entity, callback);
+}
+
+void InstanceID::DeleteToken(const std::string& authorized_entity,
+                             const std::string& scope,
+                             const DeleteTokenCallback& callback) {
+  DeleteTokenCallback wrapped_callback =

[Peter Beverloo, 2016/05/11 16:05:00]

It would be good to document why this only applies to the "GCM" scope.

[johnme, 2016/05/13 16:25:45]

Done.

+      scope == kGCMScope
+          ? base::Bind(&InstanceID::DidDelete, weak_ptr_factory_.GetWeakPtr(),
+                       authorized_entity, callback)
+          : callback;
+  DeleteTokenImpl(authorized_entity, scope, wrapped_callback);
+}
+
+void InstanceID::DeleteID(const DeleteIDCallback& callback) {
+  // Use "*" as authorized_entity to remove encryption info for all tokens.
+  DeleteIDImpl(base::Bind(&InstanceID::DidDelete,
+                          weak_ptr_factory_.GetWeakPtr(),
+                          "*" /* authorized_entity */, callback));
+}
+
+void InstanceID::DidDelete(const std::string& authorized_entity,
+                           const base::Callback<void(Result result)>& callback,
+                           Result result) {
+  gcm_driver_->encryption_provider_internal()->RemoveEncryptionInfo(
+      app_id_, authorized_entity, base::Bind(callback, result));
+}
+
 }  // namespace instance_id