weblayer: use using to cut down on verbosity

This adds using base::android::Foo in a couple of places
that make extensive use of the type.

BUG=none
TEST=none

Change-Id: I798aa724cbbe5c18de1af538aea43bba0f6b3a38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033330
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737386}

weblayer/browser/browser_impl.cc

@@ -25,6 +25,12 @@
 #include "weblayer/browser/java/jni/BrowserImpl_jni.h"
 #endif
 
+#if defined(OS_ANDROID)
+using base::android::AttachCurrentThread;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
+#endif
+
 namespace weblayer {
 
 std::unique_ptr<Browser> Browser::Create(
@@ -56,8 +62,7 @@ TabImpl* BrowserImpl::CreateTabForSessionRestore(
       std::make_unique<TabImpl>(profile_, std::move(web_contents));
 #if defined(OS_ANDROID)
   Java_BrowserImpl_createTabForSessionRestore(
-      base::android::AttachCurrentThread(), java_impl_,
-      reinterpret_cast<jlong>(tab.get()));
+      AttachCurrentThread(), java_impl_, reinterpret_cast<jlong>(tab.get()));
 #endif
   TabImpl* tab_ptr = tab.get();
   AddTab(std::move(tab));
@@ -66,7 +71,7 @@ TabImpl* BrowserImpl::CreateTabForSessionRestore(
 
 #if defined(OS_ANDROID)
 void BrowserImpl::AddTab(JNIEnv* env,
-                         const base::android::JavaParamRef<jobject>& caller,
+                         const JavaParamRef<jobject>& caller,
                          long native_tab) {
   TabImpl* tab = reinterpret_cast<TabImpl*>(native_tab);
   std::unique_ptr<Tab> owned_tab;
@@ -78,16 +83,16 @@ void BrowserImpl::AddTab(JNIEnv* env,
 }
 
 void BrowserImpl::RemoveTab(JNIEnv* env,
-                            const base::android::JavaParamRef<jobject>& caller,
+                            const JavaParamRef<jobject>& caller,
                             long native_tab) {
   // The Java side owns the Tab.
   RemoveTab(reinterpret_cast<TabImpl*>(native_tab)).release();
 }
 
-base::android::ScopedJavaLocalRef<jobjectArray> BrowserImpl::GetTabs(
+ScopedJavaLocalRef<jobjectArray> BrowserImpl::GetTabs(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
-  base::android::ScopedJavaLocalRef<jclass> clazz =
+    const JavaParamRef<jobject>& caller) {
+  ScopedJavaLocalRef<jclass> clazz =
       base::android::GetClass(env, "org/chromium/weblayer_private/TabImpl");
   jobjectArray tabs = env->NewObjectArray(tabs_.size(), clazz.obj(),
                                           nullptr /* initialElement */);
@@ -97,68 +102,63 @@ base::android::ScopedJavaLocalRef<jobjectArray> BrowserImpl::GetTabs(
     TabImpl* tab = static_cast<TabImpl*>(tabs_[i].get());
     env->SetObjectArrayElement(tabs, i, tab->GetJavaTab().obj());
   }
-  return base::android::ScopedJavaLocalRef<jobjectArray>(env, tabs);
+  return ScopedJavaLocalRef<jobjectArray>(env, tabs);
 }
 
-void BrowserImpl::SetActiveTab(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
-    long native_tab) {
+void BrowserImpl::SetActiveTab(JNIEnv* env,
+                               const JavaParamRef<jobject>& caller,
+                               long native_tab) {
   SetActiveTab(reinterpret_cast<TabImpl*>(native_tab));
 }
 
-base::android::ScopedJavaLocalRef<jobject> BrowserImpl::GetActiveTab(
+ScopedJavaLocalRef<jobject> BrowserImpl::GetActiveTab(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   if (!active_tab_)
     return nullptr;
-  return base::android::ScopedJavaLocalRef<jobject>(active_tab_->GetJavaTab());
+  return ScopedJavaLocalRef<jobject>(active_tab_->GetJavaTab());
 }
 
-void BrowserImpl::PrepareForShutdown(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+void BrowserImpl::PrepareForShutdown(JNIEnv* env,
+                                     const JavaParamRef<jobject>& caller) {
   PrepareForShutdown();
 }
 
-base::android::ScopedJavaLocalRef<jstring> BrowserImpl::GetPersistenceId(
+ScopedJavaLocalRef<jstring> BrowserImpl::GetPersistenceId(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
-  return base::android::ScopedJavaLocalRef<jstring>(
+    const JavaParamRef<jobject>& caller) {
+  return ScopedJavaLocalRef<jstring>(
       base::android::ConvertUTF8ToJavaString(env, GetPersistenceId()));
 }
 
 void BrowserImpl::SaveSessionServiceIfNecessary(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   session_service_->SaveIfNecessary();
 }
 
-base::android::ScopedJavaLocalRef<jbyteArray>
-BrowserImpl::GetSessionServiceCryptoKey(
+ScopedJavaLocalRef<jbyteArray> BrowserImpl::GetSessionServiceCryptoKey(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   std::vector<uint8_t> key;
   if (session_service_)
     key = session_service_->GetCryptoKey();
   return base::android::ToJavaByteArray(env, key);
 }
 
-base::android::ScopedJavaLocalRef<jbyteArray>
-BrowserImpl::GetMinimalPersistenceState(
+ScopedJavaLocalRef<jbyteArray> BrowserImpl::GetMinimalPersistenceState(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   auto state = GetMinimalPersistenceState();
   return base::android::ToJavaByteArray(env, &(state.front()), state.size());
 }
 
 void BrowserImpl::RestoreStateIfNecessary(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
-    const base::android::JavaParamRef<jstring>& j_persistence_id,
-    const base::android::JavaParamRef<jbyteArray>& j_persistence_crypto_key,
-    const base::android::JavaParamRef<jbyteArray>&
-        j_minimal_persistence_state) {
+    const JavaParamRef<jobject>& caller,
+    const JavaParamRef<jstring>& j_persistence_id,
+    const JavaParamRef<jbyteArray>& j_persistence_crypto_key,
+    const JavaParamRef<jbyteArray>& j_minimal_persistence_state) {
   Browser::PersistenceInfo persistence_info;
   Browser::PersistenceInfo* persistence_info_ptr = nullptr;
 
@@ -196,7 +196,7 @@ Tab* BrowserImpl::AddTab(std::unique_ptr<Tab> tab) {
   tabs_.push_back(std::move(tab));
   tab_impl->set_browser(this);
 #if defined(OS_ANDROID)
-  Java_BrowserImpl_onTabAdded(base::android::AttachCurrentThread(), java_impl_,
+  Java_BrowserImpl_onTabAdded(AttachCurrentThread(), java_impl_,
                               tab_impl->GetJavaTab());
 #endif
   for (BrowserObserver& obs : browser_observers_)
@@ -219,12 +219,11 @@ std::unique_ptr<Tab> BrowserImpl::RemoveTab(Tab* tab) {
 #if defined(OS_ANDROID)
   if (active_tab_changed) {
     Java_BrowserImpl_onActiveTabChanged(
-        base::android::AttachCurrentThread(), java_impl_,
+        AttachCurrentThread(), java_impl_,
         active_tab_ ? static_cast<TabImpl*>(active_tab_)->GetJavaTab()
                     : nullptr);
   }
-  Java_BrowserImpl_onTabRemoved(base::android::AttachCurrentThread(),
-                                java_impl_,
+  Java_BrowserImpl_onTabRemoved(AttachCurrentThread(), java_impl_,
                                 tab ? tab_impl->GetJavaTab() : nullptr);
 #endif
   if (active_tab_changed) {
@@ -244,7 +243,7 @@ void BrowserImpl::SetActiveTab(Tab* tab) {
   active_tab_ = static_cast<TabImpl*>(tab);
 #if defined(OS_ANDROID)
   Java_BrowserImpl_onActiveTabChanged(
-      base::android::AttachCurrentThread(), java_impl_,
+      AttachCurrentThread(), java_impl_,
       active_tab_ ? active_tab_->GetJavaTab() : nullptr);
 #endif
   for (BrowserObserver& obs : browser_observers_)
@@ -315,9 +314,8 @@ base::FilePath BrowserImpl::GetSessionServiceDataPath() {
 // This function is friended. JNI_BrowserImpl_CreateBrowser can not be
 // friended, as it requires browser_impl.h to include BrowserImpl_jni.h, which
 // is problematic (meaning not really supported and generates compile errors).
-BrowserImpl* CreateBrowserForAndroid(
-    ProfileImpl* profile,
-    const base::android::JavaParamRef<jobject>& java_impl) {
+BrowserImpl* CreateBrowserForAndroid(ProfileImpl* profile,
+                                     const JavaParamRef<jobject>& java_impl) {
   BrowserImpl* browser = new BrowserImpl(profile);
   browser->java_impl_ = java_impl;
   return browser;
@@ -326,7 +324,7 @@ BrowserImpl* CreateBrowserForAndroid(
 static jlong JNI_BrowserImpl_CreateBrowser(
     JNIEnv* env,
     jlong profile,
-    const base::android::JavaParamRef<jobject>& java_impl) {
+    const JavaParamRef<jobject>& java_impl) {
   // The android side does not trigger restore from the constructor as at the
   // time this is called not enough of WebLayer has been wired up. Specifically,
   // when this is called BrowserImpl.java hasn't obtained the return value so

weblayer/browser/navigation_controller_impl.cc

@@ -21,6 +21,8 @@
 
 #if defined(OS_ANDROID)
 using base::android::AttachCurrentThread;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
 #endif
 
 namespace weblayer {
@@ -33,42 +35,37 @@ NavigationControllerImpl::~NavigationControllerImpl() = default;
 #if defined(OS_ANDROID)
 void NavigationControllerImpl::SetNavigationControllerImpl(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& java_controller) {
+    const JavaParamRef<jobject>& java_controller) {
   java_controller_ = java_controller;
 }
 
-void NavigationControllerImpl::GoToIndex(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
-    int index) {
+void NavigationControllerImpl::GoToIndex(JNIEnv* env,
+                                         const JavaParamRef<jobject>& obj,
+                                         int index) {
   return GoToIndex(index);
 }
 
-void NavigationControllerImpl::Navigate(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jstring>& url) {
+void NavigationControllerImpl::Navigate(JNIEnv* env,
+                                        const JavaParamRef<jobject>& obj,
+                                        const JavaParamRef<jstring>& url) {
   Navigate(GURL(base::android::ConvertJavaStringToUTF8(env, url)));
 }
 
-base::android::ScopedJavaLocalRef<jstring>
+ScopedJavaLocalRef<jstring>
 NavigationControllerImpl::GetNavigationEntryDisplayUri(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& obj,
     int index) {
-  return base::android::ScopedJavaLocalRef<jstring>(
-      base::android::ConvertUTF8ToJavaString(
-          env, GetNavigationEntryDisplayURL(index).spec()));
+  return ScopedJavaLocalRef<jstring>(base::android::ConvertUTF8ToJavaString(
+      env, GetNavigationEntryDisplayURL(index).spec()));
 }
 
-base::android::ScopedJavaLocalRef<jstring>
-NavigationControllerImpl::GetNavigationEntryTitle(
+ScopedJavaLocalRef<jstring> NavigationControllerImpl::GetNavigationEntryTitle(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& obj,
     int index) {
-  return base::android::ScopedJavaLocalRef<jstring>(
-      base::android::ConvertUTF8ToJavaString(env,
-                                             GetNavigationEntryTitle(index)));
+  return ScopedJavaLocalRef<jstring>(base::android::ConvertUTF8ToJavaString(
+      env, GetNavigationEntryTitle(index)));
 }
 #endif
 

weblayer/browser/tab_impl.cc

@@ -56,6 +56,12 @@
 #include "weblayer/browser/captive_portal_service_factory.h"
 #endif
 
+#if defined(OS_ANDROID)
+using base::android::AttachCurrentThread;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
+#endif
+
 namespace weblayer {
 
 namespace {
@@ -140,8 +146,7 @@ void HandleJavaScriptResult(
 }  // namespace
 
 #if defined(OS_ANDROID)
-TabImpl::TabImpl(ProfileImpl* profile,
-                 const base::android::JavaParamRef<jobject>& java_impl)
+TabImpl::TabImpl(ProfileImpl* profile, const JavaParamRef<jobject>& java_impl)
     : TabImpl(profile) {
   java_impl_ = java_impl;
 }
@@ -292,10 +297,9 @@ void TabImpl::DisableAutofillSystemIntegrationForTesting() {
   g_system_autofill_disabled_for_testing = true;
 }
 
-static jlong JNI_TabImpl_CreateTab(
-    JNIEnv* env,
-    jlong profile,
-    const base::android::JavaParamRef<jobject>& java_impl) {
+static jlong JNI_TabImpl_CreateTab(JNIEnv* env,
+                                   jlong profile,
+                                   const JavaParamRef<jobject>& java_impl) {
   return reinterpret_cast<intptr_t>(
       new TabImpl(reinterpret_cast<ProfileImpl*>(profile), java_impl));
 }
@@ -310,33 +314,31 @@ static void JNI_TabImpl_DeleteTab(JNIEnv* env, jlong tab) {
     owned_tab.reset(tab_impl);
 }
 
-base::android::ScopedJavaLocalRef<jobject> TabImpl::GetWebContents(
+ScopedJavaLocalRef<jobject> TabImpl::GetWebContents(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj) {
+    const JavaParamRef<jobject>& obj) {
   return web_contents_->GetJavaWebContents();
 }
 
 void TabImpl::SetTopControlsContainerView(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
+    const JavaParamRef<jobject>& caller,
     jlong native_top_controls_container_view) {
   top_controls_container_view_ = reinterpret_cast<TopControlsContainerView*>(
       native_top_controls_container_view);
 }
 
-void TabImpl::ExecuteScript(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jstring>& script,
-    bool use_separate_isolate,
-    const base::android::JavaParamRef<jobject>& callback) {
+void TabImpl::ExecuteScript(JNIEnv* env,
+                            const JavaParamRef<jstring>& script,
+                            bool use_separate_isolate,
+                            const JavaParamRef<jobject>& callback) {
   base::android::ScopedJavaGlobalRef<jobject> jcallback(env, callback);
   ExecuteScript(base::android::ConvertJavaStringToUTF16(script),
                 use_separate_isolate,
                 base::BindOnce(&HandleJavaScriptResult, jcallback));
 }
 
-void TabImpl::SetJavaImpl(JNIEnv* env,
-                          const base::android::JavaParamRef<jobject>& impl) {
+void TabImpl::SetJavaImpl(JNIEnv* env, const JavaParamRef<jobject>& impl) {
   // This should only be called early on and only once.
   DCHECK(!java_impl_);
   java_impl_ = impl;
@@ -344,7 +346,7 @@ void TabImpl::SetJavaImpl(JNIEnv* env,
 
 void TabImpl::OnAutofillProviderChanged(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& autofill_provider) {
+    const JavaParamRef<jobject>& autofill_provider) {
   if (g_system_autofill_disabled_for_testing)
     return;
 
@@ -421,8 +423,8 @@ bool TabImpl::DoBrowserControlsShrinkRendererSize(
     const content::WebContents* web_contents) {
 #if defined(OS_ANDROID)
   TRACE_EVENT0("weblayer", "Java_TabImpl_doBrowserControlsShrinkRendererSize");
-  return Java_TabImpl_doBrowserControlsShrinkRendererSize(
-      base::android::AttachCurrentThread(), java_impl_);
+  return Java_TabImpl_doBrowserControlsShrinkRendererSize(AttachCurrentThread(),
+                                                          java_impl_);
 #else
   return false;
 #endif
@@ -509,7 +511,7 @@ void TabImpl::FindMatchRectsReply(content::WebContents* web_contents,
                                   int version,
                                   const std::vector<gfx::RectF>& rects,
                                   const gfx::RectF& active_rect) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = AttachCurrentThread();
   // Create the details object.
   ScopedJavaLocalRef<jobject> details_object =
       Java_TabImpl_createFindMatchRectsDetails(
@@ -559,7 +561,7 @@ void TabImpl::OnFindResultAvailable(content::WebContents* web_contents) {
 #if defined(OS_ANDROID)
   const find_in_page::FindNotificationDetails& find_result =
       GetFindTabHelper()->find_result();
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = AttachCurrentThread();
   Java_TabImpl_onFindResultAvailable(
       env, java_impl_, find_result.number_of_matches(),
       find_result.active_match_ordinal(), find_result.final_update());

weblayer/browser/top_controls_container_view.cc

@@ -16,12 +16,12 @@
 #include "weblayer/browser/java/jni/TopControlsContainerView_jni.h"
 
 using base::android::AttachCurrentThread;
+using base::android::JavaParamRef;
 
 namespace weblayer {
 
 TopControlsContainerView::TopControlsContainerView(
-    const base::android::JavaParamRef<jobject>&
-        java_top_controls_container_view,
+    const JavaParamRef<jobject>& java_top_controls_container_view,
     ContentViewRenderView* content_view_render_view)
     : java_top_controls_container_view_(java_top_controls_container_view),
       content_view_render_view_(content_view_render_view) {
@@ -36,7 +36,7 @@ int TopControlsContainerView::GetTopControlsHeight() {
 
 void TopControlsContainerView::CreateTopControlsLayer(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
+    const JavaParamRef<jobject>& caller,
     int id) {
   top_controls_resource_id_ = id;
   top_controls_layer_ = cc::UIResourceLayer::Create();
@@ -53,19 +53,19 @@ void TopControlsContainerView::CreateTopControlsLayer(
 
 void TopControlsContainerView::DeleteTopControlsContainerView(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   delete this;
 }
 
 void TopControlsContainerView::DeleteTopControlsLayer(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   top_controls_layer_.reset();
 }
 
 void TopControlsContainerView::SetTopControlsOffset(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
+    const JavaParamRef<jobject>& caller,
     int top_controls_offset_y,
     int top_content_offset_y) {
   // |top_controls_layer_| may not be created if the top controls view has 0
@@ -80,7 +80,7 @@ void TopControlsContainerView::SetTopControlsOffset(
 
 void TopControlsContainerView::SetTopControlsSize(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
+    const JavaParamRef<jobject>& caller,
     int width,
     int height) {
   DCHECK(top_controls_layer_);
@@ -89,7 +89,7 @@ void TopControlsContainerView::SetTopControlsSize(
 
 void TopControlsContainerView::UpdateTopControlsResource(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller) {
+    const JavaParamRef<jobject>& caller) {
   DCHECK(top_controls_layer_);
   ui::ResourceManager& resource_manager =
       content_view_render_view_->compositor()->GetResourceManager();
@@ -102,8 +102,8 @@ void TopControlsContainerView::UpdateTopControlsResource(
 
 void TopControlsContainerView::SetWebContents(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& caller,
-    const base::android::JavaParamRef<jobject>& web_contents) {
+    const JavaParamRef<jobject>& caller,
+    const JavaParamRef<jobject>& web_contents) {
   Observe(content::WebContents::FromJavaWebContents(web_contents));
 }
 
@@ -119,8 +119,7 @@ void TopControlsContainerView::DidToggleFullscreenModeForTab(
 
 static jlong JNI_TopControlsContainerView_CreateTopControlsContainerView(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>&
-        java_top_controls_container_view,
+    const JavaParamRef<jobject>& java_top_controls_container_view,
     jlong native_content_view_render_view) {
   return reinterpret_cast<jlong>(
       new TopControlsContainerView(java_top_controls_container_view,