Make the BlimpClientContextImplAndroid become a BlimpClientContextImpl

blimp/client/core/android/dummy_blimp_client_context_android.cc

Index: blimp/client/core/android/dummy_blimp_client_context_android.cc
diff --git a/blimp/client/core/android/dummy_blimp_client_context_android.cc b/blimp/client/core/android/dummy_blimp_client_context_android.cc
index 083e0e7921dac2ff2e887fad20081a74e583bc28..4fff74af3460671d1299868f2291bc5c6fcb2225 100644
--- a/blimp/client/core/android/dummy_blimp_client_context_android.cc
+++ b/blimp/client/core/android/dummy_blimp_client_context_android.cc
@@ -6,6 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
+#include "blimp/client/public/blimp_client_context.h"
 #include "jni/DummyBlimpClientContext_jni.h"
 
 namespace blimp {
@@ -19,9 +20,16 @@ DummyBlimpClientContextAndroid* DummyBlimpClientContextAndroid::FromJavaObject(
       Java_DummyBlimpClientContext_getNativePtr(env, jobj));
 }
 
-base::android::ScopedJavaLocalRef<jobject>
-DummyBlimpClientContextAndroid::GetJavaObject() {
-  return base::android::ScopedJavaLocalRef<jobject>(java_obj_);
+// This function is declared in //blimp/client/public/blimp_client_context.h,
+// and either this function or the one in
+// //blimp/client/core/android/blimp_blimp_client_context_impl_android.cc should
+// be linked in to any binary using BlimpClientContext::GetJavaObject.
+// static
+base::android::ScopedJavaLocalRef<jobject> BlimpClientContext::GetJavaObject(
+    BlimpClientContext* blimp_client_context) {
+  DummyBlimpClientContextAndroid* dummy_client_context_android =
+      static_cast<DummyBlimpClientContextAndroid*>(blimp_client_context);
+  return dummy_client_context_android->GetJavaObject();
 }
 
 DummyBlimpClientContextAndroid::DummyBlimpClientContextAndroid() {
@@ -37,5 +45,10 @@ DummyBlimpClientContextAndroid::~DummyBlimpClientContextAndroid() {
       base::android::AttachCurrentThread(), java_obj_.obj());
 }
 
+base::android::ScopedJavaLocalRef<jobject>
+DummyBlimpClientContextAndroid::GetJavaObject() {
+  return base::android::ScopedJavaLocalRef<jobject>(java_obj_);
+}
+
 }  // namespace client
 }  // namespace blimp