Remove using base::android statements from blimp

The blimp code contains cross platform code, linux code and Android code.
To avoid confusion about where code originates from, this CL removes all
'using base::android::Foo' statements, and instead fully writes them
out whenever they are used.

BUG=None

Review-Url: https://codereview.chromium.org/2339603002
Cr-Commit-Position: refs/heads/master@{#418598}

blimp/client/app/android/blimp_client_session_android.cc

@@ -19,8 +19,6 @@
 #include "net/base/net_errors.h"
 #include "ui/android/window_android.h"
 
-using base::android::JavaParamRef;
-
 namespace blimp {
 namespace client {
 namespace {
@@ -35,7 +33,7 @@ GURL CreateAssignerGURL(const std::string& assigner_url) {
 }  // namespace
 
 static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& jobj,
+                  const base::android::JavaParamRef<jobject>& jobj,
                   const base::android::JavaParamRef<jstring>& jassigner_url,
                   jlong window_android_ptr) {
   return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(
@@ -107,8 +105,9 @@ void BlimpClientSessionAndroid::OnDisconnected(int result) {
                           env, net::ErrorToShortString(result)));
 }
 
-void BlimpClientSessionAndroid::Destroy(JNIEnv* env,
-                                        const JavaParamRef<jobject>& jobj) {
+void BlimpClientSessionAndroid::Destroy(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   delete this;
 }
 

blimp/client/app/android/blimp_library_loader.cc

@@ -20,8 +20,6 @@
 #include "ui/android/ui_android_jni_registrar.h"
 #include "ui/gl/gl_surface.h"
 
-using base::android::JavaParamRef;
-
 namespace {
 
 bool OnLibrariesLoaded(JNIEnv* env, jclass clazz) {
@@ -58,7 +56,8 @@ bool RegisterJni(JNIEnv* env) {
 namespace blimp {
 namespace client {
 
-static jboolean StartBlimp(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
+static jboolean StartBlimp(JNIEnv* env,
+                           const base::android::JavaParamRef<jclass>& clazz) {
   if (!InitializeMainMessageLoop())
     return false;
 

blimp/client/app/android/blimp_view.cc

@@ -17,8 +17,6 @@
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
-using base::android::JavaParamRef;
-
 namespace {
 const int kDummyBlimpContentsId = 0;
 }  // namespace
@@ -27,14 +25,15 @@ namespace blimp {
 namespace client {
 namespace app {
 
-static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& jobj,
-                  const JavaParamRef<jobject>& blimp_client_session,
-                  jint real_width,
-                  jint real_height,
-                  jint width,
-                  jint height,
-                  jfloat dp_to_px) {
+static jlong Init(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jobject>& blimp_client_session,
+    jint real_width,
+    jint real_height,
+    jint width,
+    jint height,
+    jfloat dp_to_px) {
   BlimpClientSession* client_session =
       BlimpClientSessionAndroid::FromJavaObject(env, blimp_client_session);
 
@@ -53,7 +52,7 @@ bool BlimpView::RegisterJni(JNIEnv* env) {
 }
 
 BlimpView::BlimpView(JNIEnv* env,
-                     const JavaParamRef<jobject>& jobj,
+                     const base::android::JavaParamRef<jobject>& jobj,
                      const gfx::Size& real_size,
                      const gfx::Size& size,
                      float dp_to_px,
@@ -88,7 +87,8 @@ BlimpView::~BlimpView() {
   compositor_dependencies_.reset();
 }
 
-void BlimpView::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
+void BlimpView::Destroy(JNIEnv* env,
+                        const base::android::JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
@@ -101,12 +101,13 @@ void BlimpView::OnContentAreaSizeChanged(
   compositor_->SetSize(gfx::Size(width, height));
 }
 
-void BlimpView::OnSurfaceChanged(JNIEnv* env,
-                                 const JavaParamRef<jobject>& jobj,
-                                 jint format,
-                                 jint width,
-                                 jint height,
-                                 const JavaParamRef<jobject>& jsurface) {
+void BlimpView::OnSurfaceChanged(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    jint format,
+    jint width,
+    jint height,
+    const base::android::JavaParamRef<jobject>& jsurface) {
   if (current_surface_format_ != format) {
     current_surface_format_ = format;
     SetSurface(nullptr);
@@ -117,13 +118,15 @@ void BlimpView::OnSurfaceChanged(JNIEnv* env,
   }
 }
 
-void BlimpView::OnSurfaceCreated(JNIEnv* env,
-                                 const JavaParamRef<jobject>& jobj) {
+void BlimpView::OnSurfaceCreated(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   current_surface_format_ = 0 /** PixelFormat.UNKNOWN */;
 }
 
-void BlimpView::OnSurfaceDestroyed(JNIEnv* env,
-                                   const JavaParamRef<jobject>& jobj) {
+void BlimpView::OnSurfaceDestroyed(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   current_surface_format_ = 0 /** PixelFormat.UNKNOWN */;
   SetSurface(nullptr);
 }
@@ -146,34 +149,35 @@ void BlimpView::SetSurface(jobject surface) {
   }
 }
 
-jboolean BlimpView::OnTouchEvent(JNIEnv* env,
-                                 const JavaParamRef<jobject>& obj,
-                                 const JavaParamRef<jobject>& motion_event,
-                                 jlong time_ms,
-                                 jint android_action,
-                                 jint pointer_count,
-                                 jint history_size,
-                                 jint action_index,
-                                 jfloat pos_x_0,
-                                 jfloat pos_y_0,
-                                 jfloat pos_x_1,
-                                 jfloat pos_y_1,
-                                 jint pointer_id_0,
-                                 jint pointer_id_1,
-                                 jfloat touch_major_0,
-                                 jfloat touch_major_1,
-                                 jfloat touch_minor_0,
-                                 jfloat touch_minor_1,
-                                 jfloat orientation_0,
-                                 jfloat orientation_1,
-                                 jfloat tilt_0,
-                                 jfloat tilt_1,
-                                 jfloat raw_pos_x,
-                                 jfloat raw_pos_y,
-                                 jint android_tool_type_0,
-                                 jint android_tool_type_1,
-                                 jint android_button_state,
-                                 jint android_meta_state) {
+jboolean BlimpView::OnTouchEvent(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    const base::android::JavaParamRef<jobject>& motion_event,
+    jlong time_ms,
+    jint android_action,
+    jint pointer_count,
+    jint history_size,
+    jint action_index,
+    jfloat pos_x_0,
+    jfloat pos_y_0,
+    jfloat pos_x_1,
+    jfloat pos_y_1,
+    jint pointer_id_0,
+    jint pointer_id_1,
+    jfloat touch_major_0,
+    jfloat touch_major_1,
+    jfloat touch_minor_0,
+    jfloat touch_minor_1,
+    jfloat orientation_0,
+    jfloat orientation_1,
+    jfloat tilt_0,
+    jfloat tilt_1,
+    jfloat raw_pos_x,
+    jfloat raw_pos_y,
+    jint android_tool_type_0,
+    jint android_tool_type_1,
+    jint android_button_state,
+    jint android_meta_state) {
   ui::MotionEventAndroid::Pointer pointer0(pointer_id_0,
                                            pos_x_0,
                                            pos_y_0,

blimp/client/app/android/tab_control_feature_android.cc

@@ -9,14 +9,13 @@
 #include "jni/TabControlFeature_jni.h"
 #include "ui/gfx/geometry/size.h"
 
-using base::android::JavaParamRef;
-
 namespace blimp {
 namespace client {
 
-static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& jobj,
-                  const JavaParamRef<jobject>& blimp_client_session) {
+static jlong Init(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jobject>& blimp_client_session) {
   BlimpClientSession* client_session =
       BlimpClientSessionAndroid::FromJavaObject(env, blimp_client_session);
 
@@ -41,14 +40,15 @@ TabControlFeatureAndroid::TabControlFeatureAndroid(
 
 TabControlFeatureAndroid::~TabControlFeatureAndroid() {}
 
-void TabControlFeatureAndroid::Destroy(JNIEnv* env,
-                                       const JavaParamRef<jobject>& jobj) {
+void TabControlFeatureAndroid::Destroy(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
 void TabControlFeatureAndroid::OnContentAreaSizeChanged(
     JNIEnv* env,
-    const JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jobject>& jobj,
     jint width,
     jint height,
     jfloat dp_to_px) {

blimp/client/app/android/toolbar.cc

@@ -12,9 +12,6 @@
 #include "ui/gfx/android/java_bitmap.h"
 #include "url/gurl.h"
 
-using base::android::JavaParamRef;
-using base::android::ScopedJavaLocalRef;
-
 namespace blimp {
 namespace client {
 
@@ -24,9 +21,10 @@ const int kDummyTabId = 0;
 
 }  // namespace
 
-static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& jobj,
-                  const JavaParamRef<jobject>& blimp_client_session) {
+static jlong Init(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jobject>& blimp_client_session) {
   BlimpClientSession* client_session =
       BlimpClientSessionAndroid::FromJavaObject(env, blimp_client_session);
 
@@ -52,13 +50,15 @@ Toolbar::~Toolbar() {
   navigation_feature_->RemoveDelegate(kDummyTabId);
 }
 
-void Toolbar::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
+void Toolbar::Destroy(JNIEnv* env,
+                      const base::android::JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
-void Toolbar::OnUrlTextEntered(JNIEnv* env,
-                               const JavaParamRef<jobject>& jobj,
-                               const JavaParamRef<jstring>& text) {
+void Toolbar::OnUrlTextEntered(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jstring>& text) {
   std::string url = base::android::ConvertJavaStringToUTF8(env, text);
 
   // Build a search query, if |url| doesn't have a '.' anywhere.
@@ -69,16 +69,21 @@ void Toolbar::OnUrlTextEntered(JNIEnv* env,
   navigation_feature_->NavigateToUrlText(kDummyTabId, fixed_url.spec());
 }
 
-void Toolbar::OnReloadPressed(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
+void Toolbar::OnReloadPressed(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   navigation_feature_->Reload(kDummyTabId);
 }
 
-void Toolbar::OnForwardPressed(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
+void Toolbar::OnForwardPressed(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   navigation_feature_->GoForward(kDummyTabId);
 }
 
-jboolean Toolbar::OnBackPressed(JNIEnv* env,
-                                const JavaParamRef<jobject>& jobj) {
+jboolean Toolbar::OnBackPressed(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj) {
   navigation_feature_->GoBack(kDummyTabId);
 
   // TODO(dtrainor): Find a way to determine whether or not we're at the end of
@@ -88,7 +93,7 @@ jboolean Toolbar::OnBackPressed(JNIEnv* env,
 
 void Toolbar::OnUrlChanged(int tab_id, const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> jurl(
+  base::android::ScopedJavaLocalRef<jstring> jurl(
       base::android::ConvertUTF8ToJavaString(env, url.spec()));
 
   Java_Toolbar_onEngineSentUrl(env, java_obj_, jurl);
@@ -96,14 +101,15 @@ void Toolbar::OnUrlChanged(int tab_id, const GURL& url) {
 
 void Toolbar::OnFaviconChanged(int tab_id, const SkBitmap& favicon) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> jfavicon(gfx::ConvertToJavaBitmap(&favicon));
+  base::android::ScopedJavaLocalRef<jobject> jfavicon(
+      gfx::ConvertToJavaBitmap(&favicon));
 
   Java_Toolbar_onEngineSentFavicon(env, java_obj_, jfavicon);
 }
 
 void Toolbar::OnTitleChanged(int tab_id, const std::string& title) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> jtitle(
+  base::android::ScopedJavaLocalRef<jstring> jtitle(
       base::android::ConvertUTF8ToJavaString(env, title));
 
   Java_Toolbar_onEngineSentTitle(env, java_obj_, jtitle);

blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc

@@ -12,8 +12,6 @@
 #include "base/memory/ptr_util.h"
 #include "jni/BlimpNavigationControllerImpl_jni.h"
 
-using base::android::JavaParamRef;
-
 namespace blimp {
 namespace client {
 
@@ -72,31 +70,31 @@ BlimpNavigationControllerImplAndroid::GetTitle(JNIEnv* env, jobject jobj) {
 
 jboolean BlimpNavigationControllerImplAndroid::CanGoBack(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj) {
   return blimp_navigation_controller_impl_->CanGoBack();
 }
 
 jboolean BlimpNavigationControllerImplAndroid::CanGoForward(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj) {
   return blimp_navigation_controller_impl_->CanGoForward();
 }
 
 void BlimpNavigationControllerImplAndroid::GoBack(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj) {
   blimp_navigation_controller_impl_->GoBack();
 }
 
 void BlimpNavigationControllerImplAndroid::GoForward(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj) {
   blimp_navigation_controller_impl_->GoForward();
 }
 
 void BlimpNavigationControllerImplAndroid::Reload(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj) {
   blimp_navigation_controller_impl_->Reload();
 }
 

blimp/client/core/contents/android/ime_helper_dialog.cc

@@ -9,8 +9,6 @@
 #include "jni/ImeHelperDialog_jni.h"
 #include "ui/android/window_android.h"
 
-using base::android::JavaParamRef;
-
 namespace blimp {
 namespace client {
 
@@ -48,9 +46,10 @@ void ImeHelperDialog::OnHideImeRequested() {
   Java_ImeHelperDialog_onHideImeRequested(env, java_obj_);
 }
 
-void ImeHelperDialog::OnImeTextEntered(JNIEnv* env,
-                                       const JavaParamRef<jobject>& jobj,
-                                       const JavaParamRef<jstring>& text) {
+void ImeHelperDialog::OnImeTextEntered(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jstring>& text) {
   std::string text_input = base::android::ConvertJavaStringToUTF8(env, text);
   base::ResetAndReturn(&text_submit_callback_).Run(text_input);
 }