Implement InstanceIDAndroid using InstanceIDWithSubtype.java

components/gcm_driver/gcm_driver_android.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_ANDROID_H
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_ANDROID_H
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 33 matching lines @@
   void OnMessageReceived(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jstring>& app_id,
       const base::android::JavaParamRef<jstring>& sender_id,
       const base::android::JavaParamRef<jstring>& collapse_key,
       const base::android::JavaParamRef<jbyteArray>& raw_data,
       const base::android::JavaParamRef<jobjectArray>& data_keys_and_values);
 
   // Register JNI methods.
-  static bool RegisterBindings(JNIEnv* env);
+  static bool RegisterJni(JNIEnv* env);
 
   // GCMDriver implementation:
   void OnSignedIn() override;
   void OnSignedOut() override;
   void Enable() override;
   void AddConnectionObserver(GCMConnectionObserver* observer) override;
   void RemoveConnectionObserver(GCMConnectionObserver* observer) override;
   void Disable() override;
   GCMClient* GetGCMClientForTesting() const override;
   bool IsStarted() const override;
@@ skipping 39 matching lines @@
 
   // Recorder that logs GCM activities.
   GCMStatsRecorderAndroid recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriverAndroid);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_ANDROID_H