Make the BlimpClientContextImplAndroid become a BlimpClientContextImpl

blimp/client/core/dummy_blimp_client_context.h

Index: blimp/client/core/dummy_blimp_client_context.h
diff --git a/blimp/client/core/dummy_blimp_client_context.h b/blimp/client/core/dummy_blimp_client_context.h
index d5f9c90accab9c684e677889df8a3c2c176b61cf..92f6e31356ae3c2d03aaa7c4ea42f52dd892716a 100644
--- a/blimp/client/core/dummy_blimp_client_context.h
+++ b/blimp/client/core/dummy_blimp_client_context.h
@@ -6,36 +6,19 @@
 #define BLIMP_CLIENT_CORE_DUMMY_BLIMP_CLIENT_CONTEXT_H_
 
 #include "base/macros.h"
-#include "base/supports_user_data.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_contents.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#endif  // defined(OS_ANDROID)
-
 namespace blimp {
 namespace client {
 
-#if defined(OS_ANDROID)
-class DummyBlimpClientContextAndroid;
-#endif  // defined(OS_ANDROID)
-
 // A dummy implementation of the BlimpClientContext.
-class DummyBlimpClientContext : public BlimpClientContext,
-                                base::SupportsUserData {
+class DummyBlimpClientContext : public BlimpClientContext {
  public:
   DummyBlimpClientContext();
   ~DummyBlimpClientContext() override;
 
-#if defined(OS_ANDROID)
-  DummyBlimpClientContextAndroid* GetDummyBlimpClientContextAndroid();
-#endif  // defined(OS_ANDROID)
-
-// BlimpClientContext implementation.
-#if defined(OS_ANDROID)
-  base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
-#endif  // defined(OS_ANDROID)
+  // BlimpClientContext implementation.
   void SetDelegate(BlimpClientContextDelegate* delegate) override;
   std::unique_ptr<BlimpContents> CreateBlimpContents() override;