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

chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java

 // 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.
 
 package org.chromium.chrome.browser.banners;
 
+import android.content.Context;
 import android.text.TextUtils;
 
-import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.content_public.browser.WebContents;
 
 /**
  * Manages an AppBannerInfoBar for a Tab.
@@ skipping 37 matching lines @@
      */
     public static void setAppDetailsDelegate(AppDetailsDelegate delegate) {
         if (sAppDetailsDelegate != null) sAppDetailsDelegate.destroy();
         sAppDetailsDelegate = delegate;
     }
 
     /**
      * Constructs an AppBannerManager for the given tab.
      * @param tab Tab that the AppBannerManager will be attached to.
      */
-    public AppBannerManager(Tab tab) {
-        mNativePointer = nativeInit();
+    public AppBannerManager(Tab tab, Context context) {
+        int iconSize = context.getResources().getDimensionPixelSize(R.dimen.app_banner_icon_size);
+        mNativePointer = nativeInit(iconSize);
         mTab = tab;
         updatePointers();
     }
 
     @Override
     public void onWebContentsSwapped(Tab tab, boolean didStartLoad,
             boolean didFinishLoad) {
         updatePointers();
     }
 
     @Override
     public void onContentChanged(Tab tab) {
         updatePointers();
     }
 
     /**
      * Destroys the native AppBannerManager.
      */
     public void destroy() {
         nativeDestroy(mNativePointer);
     }
 
     /**
      * Updates which WebContents the native AppBannerManager is monitoring.
      */
     private void updatePointers() {
         nativeReplaceWebContents(mNativePointer, mTab.getWebContents());
     }
 
-    @CalledByNative
-    private int getPreferredIconSize() {
-        return ApplicationStatus.getApplicationContext().getResources().getDimensionPixelSize(
-                R.dimen.app_banner_icon_size);
-    }
-
     /**
      * Grabs package information for the banner asynchronously.
      * @param url         URL for the page that is triggering the banner.
      * @param packageName Name of the package that is being advertised.
      */
     @CalledByNative
-    private void fetchAppDetails(String url, String packageName) {
+    private void fetchAppDetails(String url, String packageName, int iconSize) {
         if (sAppDetailsDelegate == null) return;
-        int iconSize = getPreferredIconSize();
         sAppDetailsDelegate.getAppDetailsAsynchronously(
                 createAppDetailsObserver(), url, packageName, iconSize);
     }
 
     private AppDetailsDelegate.Observer createAppDetailsObserver() {
         return new AppDetailsDelegate.Observer() {
             /**
              * Called when data about the package has been retrieved, which includes the url for the
              * app's icon but not the icon Bitmap itself.
              * @param data Data about the app.  Null if the task failed.
@@ skipping 23 matching lines @@
         nativeSetTimeDeltaForTesting(days);
     }
 
     /** Returns whether a BitmapFetcher is actively retrieving an app icon. */
     @VisibleForTesting
     public boolean isFetcherActiveForTesting() {
         return nativeIsFetcherActive(mNativePointer);
     }
 
     private static native boolean nativeIsEnabled();
-    private native long nativeInit();
+    private native long nativeInit(int iconSize);
     private native void nativeDestroy(long nativeAppBannerManager);
     private native void nativeReplaceWebContents(long nativeAppBannerManager,
             WebContents webContents);
     private native boolean nativeOnAppDetailsRetrieved(long nativeAppBannerManager, AppData data,
             String title, String packageName, String imageUrl);
 
     // Testing methods.
     private static native void nativeSetTimeDeltaForTesting(int days);
     private native boolean nativeIsFetcherActive(long nativeAppBannerManager);
 }