Re-apply: [Android] Fix WebView tests breakage after http://crrev.com/10916160

Original CL: https://codereview.chromium.org/10947028
Now with DEPS update.

BUG=116131

Review URL: https://codereview.chromium.org/10947032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157548 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 24 insertions, 3 deletions

diff --git a/android_webview/DEPS b/android_webview/DEPS
index 0a18ac3..871dd41 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -14,4 +14,5 @@ include_rules = [
   "+content/public",
   "+jni",
   "+net",
+  "+ui/android",
 ]
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 9239e382f..cb303f9 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -85,6 +85,7 @@
       'dependencies': [
         '<(DEPTH)/content/content.gyp:content_java',
         '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '<(DEPTH)/ui/ui.gyp:ui_java',
       ],
       'variables': {
         'package_name': 'android_webview_java',
@@ -137,6 +138,12 @@
         'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar'],
         'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
       },
+      {
+        'action_name': 'copy_ui_jar',
+        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
+        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar'],
+        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+      },
       # TODO: This should be removed once we stop sharing the chrome/ layer JNI
       # registration code.  We currently include this because we reuse the
       # chrome/ layer JNI registration code (which will crash if these classes
@@ -213,6 +220,7 @@
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar',
+          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar',
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
@@ -277,6 +285,12 @@
           'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
         },
         {
+          'action_name': 'copy_ui_jar',
+          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
+          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_ui.jar'],
+          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+        },
+        {
           'action_name': 'copy_content_jar',
           'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
           'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content.jar'],
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml
index f283c19..d35ab7e 100644
--- a/android_webview/java/android_webview_apk.xml
+++ b/android_webview/java/android_webview_apk.xml
@@ -25,6 +25,7 @@
     <fileset file="${out.dir}/java/libs/chromium_content.jar"/>
     <fileset file="${out.dir}/java/libs/chromium_media.jar"/>
     <fileset file="${out.dir}/java/libs/chromium_net.jar"/>
+    <fileset file="${out.dir}/java/libs/chromium_ui.jar"/>
     <fileset file="${out.dir}/java/libs/chromium_web_contents_delegate_android.jar"/>
   </path>
   <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 69c1526..0481380 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -11,6 +11,7 @@ import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.common.CleanupReference;
+import org.chromium.ui.gfx.NativeWindow;
 
 /**
  * Exposes the native AwContents class, and together these classes wrap the ContentViewCore
@@ -57,7 +58,8 @@ public class AwContents {
     public AwContents(ViewGroup containerView,
         ContentViewCore.InternalAccessDelegate internalAccessAdapter,
         ContentViewCore contentViewCore, AwContentsClient contentsClient,
-        boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) {
+        NativeWindow nativeWindow, boolean privateBrowsing,
+        boolean isAccessFromFileURLsGrantedByDefault) {
       mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);
       mContentViewCore = contentViewCore;
       mContentsClient = contentsClient;
@@ -65,7 +67,8 @@ public class AwContents {
 
       // TODO: upstream the needed ContentViewCore initialization method.
       // mContentViewCore.initialize(containerView, internalAccessAdapter, false,
-      //     nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault);
+      //     nativeGetWebContents(mNativeAwContents), nativeWindow,
+      //     isAccessFromFileURLsGrantedByDefault);
       mContentViewCore.setContentViewClient(contentsClient);
     }
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 065312a..e27e4a0 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -22,6 +22,7 @@ import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.test.CallbackHelper;
 import org.chromium.content.browser.test.TestCallbackHelperContainer;
+import org.chromium.ui.gfx.NativeWindow;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -145,7 +146,8 @@ public class AndroidWebViewTestBase
                 getActivity(), ContentViewCore.PERSONALITY_VIEW);
         testContainerView.initialize(contentViewCore,
                 new AwContents(testContainerView, testContainerView.getInternalAccessDelegate(),
-                contentViewCore, contentsClient, incognito, false));
+                contentViewCore, contentsClient, new NativeWindow(getActivity()),
+                incognito, false));
         getActivity().addView(testContainerView);
         return testContainerView;
     }