Optimizing DateTimeAndroid and ColorChooserAndroid initializations.

components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

Index: components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
index c1fe69ce5e34d825de024a89eb11ec16d4227841..e0041a370d32de4177bf4a566d6536c683cf01f5 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
@@ -4,14 +4,15 @@
 
 package org.chromium.components.web_contents_delegate_android;
 
+import android.app.Activity;
 import android.content.Context;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.ColorPickerDialog;
 import org.chromium.ui.ColorSuggestion;
 import org.chromium.ui.OnColorChangedListener;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * ColorChooserAndroid communicates with the java ColorPickerDialog and the
@@ -48,11 +49,13 @@ public class ColorChooserAndroid {
     @CalledByNative
     public static ColorChooserAndroid createColorChooserAndroid(
             long nativeColorChooserAndroid,
-            ContentViewCore contentViewCore,
+            WindowAndroid windowAndroid,
             int initialColor,
             ColorSuggestion[] suggestions) {
+        Activity windowAndroidActivity = windowAndroid.getActivity().get();
+        if (windowAndroidActivity == null) return null;
         ColorChooserAndroid chooser = new ColorChooserAndroid(nativeColorChooserAndroid,
-                contentViewCore.getContext(), initialColor, suggestions);
+                windowAndroidActivity, initialColor, suggestions);
         chooser.openColorChooser();
         return chooser;
     }