Integrate InstanceID with GCM crypto provider

components/gcm_driver/instance_id/instance_id_android.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_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
 
 #include <jni.h>
 
 #include <map>
@@ skipping 22 matching lines @@
     ~ScopedBlockOnAsyncTasksForTesting();
 
    private:
     bool previous_value_;
     DISALLOW_COPY_AND_ASSIGN(ScopedBlockOnAsyncTasksForTesting);
   };
 
   // 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:
   void GetID(const GetIDCallback& callback) override;
   void GetCreationTime(const GetCreationTimeCallback& callback) override;
   void GetToken(const std::string& audience,
                 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,
                 const base::android::JavaParamRef<jobject>& obj,
                 jint request_id,
                 const base::android::JavaParamRef<jstring>& jid);
   void DidGetCreationTime(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj,
                           jint request_id,
                           jlong creation_time_unix_ms);
@@ skipping 20 matching lines @@
   IDMap<DeleteIDCallback, IDMapOwnPointer> delete_id_callbacks_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceIDAndroid);
 };
 
 }  // namespace instance_id
 
 #endif  // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_