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

android_webview/android_webview.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'libwebview',
@@ skipping 67 matching lines @@
           ],
         },
       ],
     },
     {
       'target_name': 'android_webview_java',
       'type': 'none',
       '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',
         'java_in_dir': '<(DEPTH)/android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_javatests',
       'type': 'none',
@@ skipping 32 matching lines @@
         'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
         'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar'],
         'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
       },
       {
         'action_name': 'copy_content_jar',
         'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
         '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
       # are not present in the APK).
       {
         'action_name': 'copy_chrome_jar',
         'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_chrome.jar'],
         'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar'],
         'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
       },
@@ skipping 56 matching lines @@
         'inputs': [
           '<(DEPTH)/android_webview/java/android_webview_apk.xml',
           '<(DEPTH)/android_webview/java/AndroidManifest.xml',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar',
           '<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar',
           '<(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',
           '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
           '<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so',
         ],
         'outputs': [
           '<(PRODUCT_DIR)/android_webview/AndroidWebView-debug.apk',
         ],
         'action': [
@@ skipping 44 matching lines @@
           'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_net.jar'],
           'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
         },
         {
           'action_name': 'copy_media_jar',
           'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
           'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_media.jar'],
           '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'],
           'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
         },
         {
           'action_name': 'copy_web_contents_delegate_android_java',
           'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
           'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_web_contents_delegate_android.jar'],
           'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
@@ skipping 30 matching lines @@
             '-DANDROID_SDK_VERSION=<(android_sdk_version)',
             '-DANDROID_GDBSERVER=<(android_gdbserver)',
             '-buildfile',
             '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
           ]
         }
       ],
     },
   ],
 }