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..aaae1b2634e7e1ae95689eed1be43f003c00b204 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
@@ -8,10 +8,10 @@ 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 +48,11 @@ public class ColorChooserAndroid {
     @CalledByNative
     public static ColorChooserAndroid createColorChooserAndroid(
             long nativeColorChooserAndroid,
-            ContentViewCore contentViewCore,
+            WindowAndroid windowAndroid,
             int initialColor,
             ColorSuggestion[] suggestions) {
         ColorChooserAndroid chooser = new ColorChooserAndroid(nativeColorChooserAndroid,
-                contentViewCore.getContext(), initialColor, suggestions);
+                windowAndroid.getActivity().get(), initialColor, suggestions);

[Ted C, 2014/10/30 00:01:01]

.getActivity().get() can be null in the case of WebView which was not created
with the activity context or if this is called as the activity is garbage
collected, neither of which are very likely cases, but it might be worth
handling it.

Maybe in this case, you could return null from this method if .get() returns
null.  Then in native, you could just call OnColorChosen with the initial color.

I don't know if this will work, but it would be good to try (even just forcing
it to happen to make sure it doesn't crash) to handle this odd cases.

The same will apply in the date time picker.

[AKVT, 2014/10/30 18:26:02]

Done. Thank you

         chooser.openColorChooser();
         return chooser;
     }