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

R=benm@chromium.org,android-webview-reviews@google.com
BUG=116131

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

TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/10941032

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

4 files changed, 3 insertions, 23 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index cb303f9..9239e382f 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -85,7 +85,6 @@
       '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',
@@ -138,12 +137,6 @@
         '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
@@ -220,7 +213,6 @@
           '<(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',
@@ -285,12 +277,6 @@
           '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 d35ab7e..f283c19 100644
--- a/android_webview/java/android_webview_apk.xml
+++ b/android_webview/java/android_webview_apk.xml
@@ -25,7 +25,6 @@
     <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 0481380..69c1526 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -11,7 +11,6 @@ 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
@@ -58,8 +57,7 @@ public class AwContents {
     public AwContents(ViewGroup containerView,
         ContentViewCore.InternalAccessDelegate internalAccessAdapter,
         ContentViewCore contentViewCore, AwContentsClient contentsClient,
-        NativeWindow nativeWindow, boolean privateBrowsing,
-        boolean isAccessFromFileURLsGrantedByDefault) {
+        boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) {
       mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);
       mContentViewCore = contentViewCore;
       mContentsClient = contentsClient;
@@ -67,8 +65,7 @@ public class AwContents {
 
       // TODO: upstream the needed ContentViewCore initialization method.
       // mContentViewCore.initialize(containerView, internalAccessAdapter, false,
-      //     nativeGetWebContents(mNativeAwContents), nativeWindow,
-      //     isAccessFromFileURLsGrantedByDefault);
+      //     nativeGetWebContents(mNativeAwContents), 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 e27e4a0..065312a 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,7 +22,6 @@ 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;
@@ -146,8 +145,7 @@ public class AndroidWebViewTestBase
                 getActivity(), ContentViewCore.PERSONALITY_VIEW);
         testContainerView.initialize(contentViewCore,
                 new AwContents(testContainerView, testContainerView.getInternalAccessDelegate(),
-                contentViewCore, contentsClient, new NativeWindow(getActivity()),
-                incognito, false));
+                contentViewCore, contentsClient, incognito, false));
         getActivity().addView(testContainerView);
         return testContainerView;
     }