Make the BlimpClientContextImplAndroid become a BlimpClientContextImpl

blimp/client/core/android/dummy_blimp_client_context_android.h

Index: blimp/client/core/android/dummy_blimp_client_context_android.h
diff --git a/blimp/client/core/android/dummy_blimp_client_context_android.h b/blimp/client/core/android/dummy_blimp_client_context_android.h
index 09923c67554e436948a173c803f2380403aa5ca3..f3e104266724565d0aaaaf962f722475c10228fc 100644
--- a/blimp/client/core/android/dummy_blimp_client_context_android.h
+++ b/blimp/client/core/android/dummy_blimp_client_context_android.h
@@ -7,22 +7,22 @@
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "base/supports_user_data.h"
 #include "blimp/client/core/dummy_blimp_client_context.h"
 
 namespace blimp {
 namespace client {
 
 // JNI bridge between DummyBlimpClientContext in Java and C++.
-class DummyBlimpClientContextAndroid : public base::SupportsUserData::Data {
+class DummyBlimpClientContextAndroid : public DummyBlimpClientContext {
  public:
   static DummyBlimpClientContextAndroid* FromJavaObject(JNIEnv* env,
                                                         jobject jobj);
-  base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
   DummyBlimpClientContextAndroid();
   ~DummyBlimpClientContextAndroid() override;
 
+  base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
+
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;