android: Remove DeviceDisplayInfo from ResourceBundle

Instead, copy the logic to get the primary display density in
resource_bundle_android. Note this is not using Display to avoid
initializing Display backend in any child process.

BUG=625089

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

ui/android/java/src/org/chromium/ui/base/ResourceBundle.java

@@ -4,9 +4,14 @@
 
 package org.chromium.ui.base;
 
+import android.util.DisplayMetrics;
+import android.view.Display;
+
 import org.chromium.base.BuildConfig;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.ui.display.DisplayAndroidManager;
 
 import java.util.Arrays;
 
@@ -15,7 +20,9 @@ import java.util.Arrays;
  * library.
  */
 @JNINamespace("ui")
-public class ResourceBundle {
+final class ResourceBundle {
+    private ResourceBundle() {}
+
     @CalledByNative
     private static String getLocalePakResourcePath(String locale) {
         if (Arrays.binarySearch(BuildConfig.UNCOMPRESSED_LOCALES, locale) >= 0) {
@@ -23,4 +30,13 @@ public class ResourceBundle {
         }
         return null;
     }
+
+    @CalledByNative
+    private static float getPrimaryDisplayScale() {
+        Display primaryDisplay = DisplayAndroidManager.getDefaultDisplayForContext(
+                ContextUtils.getApplicationContext());
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        primaryDisplay.getMetrics(displayMetrics);
+        return displayMetrics.density;
+    }
 }

ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java

@@ -26,7 +26,7 @@ import org.chromium.ui.gfx.DeviceDisplayInfo;
  * DisplayAndroidManager is a class that informs its observers Display changes.
  */
 @JNINamespace("ui")
-/* package */ class DisplayAndroidManager {
+public class DisplayAndroidManager {
     /**
      * DisplayListenerBackend is an interface that abstract the mechanism used for the actual
      * display update listening. The reason being that from Android API Level 17 DisplayListener
@@ -204,7 +204,7 @@ import org.chromium.ui.gfx.DeviceDisplayInfo;
         return sDisplayAndroidManager;
     }
 
-    /* package */ static Display getDefaultDisplayForContext(Context context) {
+    public static Display getDefaultDisplayForContext(Context context) {
         WindowManager windowManager =
                 (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         return windowManager.getDefaultDisplay();

ui/base/resource/resource_bundle.cc

@@ -44,7 +44,6 @@
 
 #if defined(OS_ANDROID)
 #include "ui/base/resource/resource_bundle_android.h"
-#include "ui/gfx/android/device_display_info.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -693,8 +692,7 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
   if (display::Display::HasForceDeviceScaleFactor()) {
     display_density = display::Display::GetForcedDeviceScaleFactor();
   } else {
-    gfx::DeviceDisplayInfo device_info;
-    display_density = device_info.GetDIPScale();
+    display_density = GetPrimaryDisplayScale();
   }
   const ScaleFactor closest = FindClosestScaleFactorUnsafe(display_density);
   if (closest != SCALE_FACTOR_100P)

ui/base/resource/resource_bundle_android.cc

@@ -166,4 +166,9 @@ std::string GetPathForAndroidLocalePakWithinApk(const std::string& locale) {
   return base::android::ConvertJavaStringToUTF8(env, ret.obj());
 }
 
+float GetPrimaryDisplayScale() {
+  return Java_ResourceBundle_getPrimaryDisplayScale(
+      base::android::AttachCurrentThread());
+}
+
 }  // namespace ui

ui/base/resource/resource_bundle_android.h

@@ -41,6 +41,10 @@ UI_BASE_EXPORT void SetLocalePaksStoredInApk(bool value);
 UI_BASE_EXPORT std::string GetPathForAndroidLocalePakWithinApk(
     const std::string& locale);
 
+// Get the density of the primary display. Use this instead of using Display
+// to avoid initializing Display in child processes.
+float GetPrimaryDisplayScale();
+
 }  // namespace ui
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_ANDROID_H_