Integrate InstanceID with GCM crypto provider

components/gcm_driver/instance_id/instance_id_android.cc

 // 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.
 
 #include "components/gcm_driver/instance_id/instance_id_android.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 28 matching lines @@
   Java_InstanceIDBridge_setBlockOnAsyncTasksForTesting(env, previous_value_);
 }
 
 // static
 bool InstanceIDAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 std::unique_ptr<InstanceID> InstanceID::Create(const std::string& app_id,
-                                               gcm::InstanceIDHandler* unused) {
-  return base::WrapUnique(new InstanceIDAndroid(app_id));
+                                               gcm::GCMDriver* gcm_driver) {
+  return base::WrapUnique(new InstanceIDAndroid(app_id, gcm_driver));
 }
 
-InstanceIDAndroid::InstanceIDAndroid(const std::string& app_id)
-    : InstanceID(app_id) {
+InstanceIDAndroid::InstanceIDAndroid(const std::string& app_id,
+                                     gcm::GCMDriver* gcm_driver)
+    : InstanceID(app_id, gcm_driver) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DCHECK(!app_id.empty()) << "Empty app_id is not supported";
   // The |app_id| is stored in GCM's category field by the desktop InstanceID
   // implementation, but because the category is reserved for the app's package
   // name on Android the subtype field is used instead.
   std::string subtype = app_id;
 
   JNIEnv* env = AttachCurrentThread();
   java_ref_.Reset(Java_InstanceIDBridge_create(
@@ skipping 45 matching lines @@
   }
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_getToken(
       env, java_ref_.obj(), request_id,
       ConvertUTF8ToJavaString(env, authorized_entity).obj(),
       ConvertUTF8ToJavaString(env, scope).obj(),
       base::android::ToJavaArrayOfStrings(env, options_strings).obj());
 }
 
-void InstanceIDAndroid::DeleteToken(const std::string& authorized_entity,
-                                    const std::string& scope,
-                                    const DeleteTokenCallback& callback) {
+void InstanceIDAndroid::DeleteTokenImpl(const std::string& authorized_entity,
+                                        const std::string& scope,
+                                        const DeleteTokenCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   int32_t request_id =
       delete_token_callbacks_.Add(new DeleteTokenCallback(callback));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_deleteToken(
       env, java_ref_.obj(), request_id,
       ConvertUTF8ToJavaString(env, authorized_entity).obj(),
       ConvertUTF8ToJavaString(env, scope).obj());
 }
 
-void InstanceIDAndroid::DeleteID(const DeleteIDCallback& callback) {
+void InstanceIDAndroid::DeleteIDImpl(const DeleteIDCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   int32_t request_id = delete_id_callbacks_.Add(new DeleteIDCallback(callback));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_deleteInstanceID(env, java_ref_.obj(), request_id);
 }
 
 void InstanceIDAndroid::DidGetID(
     JNIEnv* env,
@@ skipping 65 matching lines @@
     jboolean success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DeleteIDCallback* callback = delete_id_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->Run(success ? InstanceID::SUCCESS : InstanceID::UNKNOWN_ERROR);
   delete_id_callbacks_.Remove(request_id);
 }
 
 }  // namespace instance_id