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

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 9239e382fadcfd6438938c61ca28b10fcb1da5a6..cb303f902f70969168f4be83ba715d388d4991ce 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'],