Integrate InstanceID with GCM crypto provider

components/gcm_driver/instance_id/instance_id_android.h

Index: components/gcm_driver/instance_id/instance_id_android.h
diff --git a/components/gcm_driver/instance_id/instance_id_android.h b/components/gcm_driver/instance_id/instance_id_android.h
index 4b4deff17f9e8dc91eac41244601114849c0f8ec..57760e38d79ee139fa827236accf9eb7a687d2f9 100644
--- a/components/gcm_driver/instance_id/instance_id_android.h
+++ b/components/gcm_driver/instance_id/instance_id_android.h
@@ -40,7 +40,7 @@ class InstanceIDAndroid : public InstanceID {
   // Register JNI methods.
   static bool RegisterJni(JNIEnv* env);
 
-  InstanceIDAndroid(const std::string& app_id);
+  InstanceIDAndroid(const std::string& app_id, gcm::GCMDriver* gcm_driver);
   ~InstanceIDAndroid() override;
 
   // InstanceID implementation:
@@ -50,10 +50,10 @@ class InstanceIDAndroid : public InstanceID {
                 const std::string& scope,
                 const std::map<std::string, std::string>& options,
                 const GetTokenCallback& callback) override;
-  void DeleteToken(const std::string& audience,
-                   const std::string& scope,
-                   const DeleteTokenCallback& callback) override;
-  void DeleteID(const DeleteIDCallback& callback) override;
+  void DeleteTokenImpl(const std::string& audience,
+                       const std::string& scope,
+                       const DeleteTokenCallback& callback) override;
+  void DeleteIDImpl(const DeleteIDCallback& callback) override;
 
   // Methods called from Java via JNI:
   void DidGetID(JNIEnv* env,