[App banners] Stop passing JNI barrier to get icon size

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 73 matching lines @@
     const GURL url,
     const SkBitmap* icon) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (!is_cancelled_)
     manager_->OnFetchComplete(this, url, icon);
 
   delete this;
 }
 
-AppBannerManager::AppBannerManager(JNIEnv* env, jobject obj)
-    : fetcher_(nullptr),
+AppBannerManager::AppBannerManager(JNIEnv* env, jobject obj, int icon_size)
+    : preferred_icon_size_(icon_size),
+      fetcher_(nullptr),
       weak_java_banner_view_manager_(env, obj),
       weak_factory_(this) {
 }
 
 AppBannerManager::~AppBannerManager() {
   CancelActiveFetcher();
 }
 
 void AppBannerManager::Destroy(JNIEnv* env, jobject obj) {
   delete this;
@@ skipping 66 matching lines @@
                  weak_factory_.GetWeakPtr()));
 }
 
 void AppBannerManager::OnDidCheckHasServiceWorker(bool has_service_worker) {
   if (has_service_worker) {
     // TODO(benwells): Check triggering parameters.
     // Create an infobar to promote the manifest's app.
     GURL icon_url =
         ManifestIconSelector::FindBestMatchingIcon(
             web_app_data_.icons,
-            GetPreferredIconSize(),
+            preferred_icon_size_,
             gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
     if (icon_url.is_empty())
       return;
 
     FetchIcon(icon_url);
   } else {
     TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
   }
 }
 
@@ skipping 100 matching lines @@
   if (jobj.is_null())
     return;
 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, expected_url.spec()));
   ScopedJavaLocalRef<jstring> jpackage(
       ConvertUTF8ToJavaString(env, tag_content));
   Java_AppBannerManager_fetchAppDetails(env,
                                         jobj.obj(),
                                         jurl.obj(),
-                                        jpackage.obj());
+                                        jpackage.obj(),
+                                        preferred_icon_size_);
 }
 
 bool AppBannerManager::OnAppDetailsRetrieved(JNIEnv* env,
                                              jobject obj,
                                              jobject japp_data,
                                              jstring japp_title,
                                              jstring japp_package,
                                              jstring jicon_url) {
   if (validated_url_ != web_contents()->GetURL())
     return false;
@@ skipping 21 matching lines @@
   fetcher_ = new BannerBitmapFetcher(image_url, this);
   fetcher_->Start(
       profile->GetRequestContext(),
       std::string(),
       net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
       net::LOAD_NORMAL);
   app_icon_url_ = image_url;
   return true;
 }
 
-int AppBannerManager::GetPreferredIconSize() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
-  if (jobj.is_null())
-    return 0;
-
-  return Java_AppBannerManager_getPreferredIconSize(env, jobj.obj());
-}
-
 // static
 base::Time AppBannerManager::GetCurrentTime() {
   return base::Time::Now() + gTimeDeltaForTesting;
 }
 
-jlong Init(JNIEnv* env, jobject obj) {
-  AppBannerManager* manager = new AppBannerManager(env, obj);
+jlong Init(JNIEnv* env, jobject obj, jint icon_size) {
+  AppBannerManager* manager = new AppBannerManager(env, obj, icon_size);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 jboolean IsEnabled(JNIEnv* env, jclass clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAppInstallAlerts);
 }
 
 void SetTimeDeltaForTesting(JNIEnv* env, jclass clazz, jint days) {
   gTimeDeltaForTesting = base::TimeDelta::FromDays(days);
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners