Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

5 files changed, 223 insertions, 102 deletions

diff --git a/chromium/android_webview/all_webview.gyp b/chromium/android_webview/all_webview.gyp
deleted file mode 100644
index 5da9b2f1a16..00000000000
--- a/chromium/android_webview/all_webview.gyp
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-# This is used as the top-level gyp file for building WebView in the Android
-# tree. It should depend only on native code, as we cannot currently generate
-# correct makefiles to build Java code via gyp in the Android tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'All',
-      'type': 'none',
-      'dependencies': [
-        'android_webview.gyp:libwebviewchromium',
-
-        # Needed by android_webview_java
-        '../base/base.gyp:base_java_activity_state',
-        '../base/base.gyp:base_java_memory_pressure_level_list',
-        '../content/content.gyp:page_transition_types_java',
-        '../content/content.gyp:popup_item_type_java',
-        '../content/content.gyp:result_codes_java',
-        '../content/content.gyp:speech_recognition_error_java',
-        '../media/media.gyp:media_android_imageformat_list',
-        '../net/net.gyp:certificate_mime_types_java',
-        '../net/net.gyp:cert_verify_result_android_java',
-        '../net/net.gyp:net_errors_java',
-        '../net/net.gyp:private_key_types_java',
-        '../ui/android/ui_android.gyp:window_open_disposition_java',
-      ],
-    }, # target_name: All
-  ],  # targets
-}
diff --git a/chromium/android_webview/android_webview.gyp b/chromium/android_webview/android_webview.gyp
index 941aaa3913e..2efc46c1b57 100644
--- a/chromium/android_webview/android_webview.gyp
+++ b/chromium/android_webview/android_webview.gyp
@@ -5,13 +5,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'conditions': [
-    ['android_webview_build==0', {
-      'includes': [
-        'android_webview_tests.gypi',
-      ],
-    }],
-  ],
   'targets': [
     {
       'target_name': 'libwebviewchromium',
@@ -26,12 +19,28 @@
         [ 'android_webview_build==0', {
           'product_prefix': 'libstandalone',
         }],
-        # The general approach is to allow the executable target to choose
-        # the allocator, but as in the WebView case we are building a library
-        # only, put the dependency on the allocator here
-        [ 'android_webview_build==1 and android_use_tcmalloc==1', {
+        [ 'android_webview_build==1', {
+          # When building inside the android tree we also need to depend on all
+          # the java sources generated from templates which will be needed by
+          # android_webview_java in android_webview/Android.mk.
           'dependencies': [
-            '../base/allocator/allocator.gyp:allocator', ],
+            '../base/base.gyp:base_java_application_state',
+            '../base/base.gyp:base_java_memory_pressure_level_list',
+            '../content/content.gyp:content_gamepad_mapping',
+            '../content/content.gyp:gesture_event_type_java',
+            '../content/content.gyp:page_transition_types_java',
+            '../content/content.gyp:popup_item_type_java',
+            '../content/content.gyp:result_codes_java',
+            '../content/content.gyp:screen_orientation_values_java',
+            '../content/content.gyp:speech_recognition_error_java',
+            '../media/media.gyp:media_android_imageformat_list',
+            '../net/net.gyp:cert_verify_status_android_java',
+            '../net/net.gyp:certificate_mime_types_java',
+            '../net/net.gyp:net_errors_java',
+            '../net/net.gyp:private_key_types_java',
+            '../ui/android/ui_android.gyp:bitmap_format_java',
+            '../ui/android/ui_android.gyp:window_open_disposition_java',
+          ],
         }],
         [ 'android_webview_build==1 and use_system_skia==0', {
           # When not using the system skia there are linker warnings about
@@ -58,9 +67,6 @@
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
       ],
-      'variables': {
-        'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
-      },
       'actions': [
         {
           'action_name': 'repack_android_webview_pack',
@@ -72,16 +78,9 @@
               '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],
+            'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
           },
-          'inputs': [
-            '<(repack_path)',
-            '<@(pak_inputs)',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
-          ],
-          'action': ['python', '<(repack_path)', '<@(_outputs)',
-                     '<@(pak_inputs)'],
+         'includes': [ '../build/repack_action.gypi' ],
         }
       ],
     },
@@ -92,6 +91,9 @@
         '../android_webview/native/webview_native.gyp:webview_native',
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:autofill_content_renderer',
+        '../components/components.gyp:cdm_browser',
+        '../components/components.gyp:cdm_renderer',
+        '../components/components.gyp:data_reduction_proxy_browser',
         '../components/components.gyp:navigation_interception',
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_renderer',
@@ -99,9 +101,12 @@
         '../content/content.gyp:content_app_both',
         '../gpu/gpu.gyp:command_buffer_service',
         '../gpu/gpu.gyp:gles2_implementation',
+        '../gpu/gpu.gyp:gl_in_process_context',
+        '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../v8/tools/gyp/v8.gyp:v8',
         '../ui/gl/gl.gyp:gl',
         '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
@@ -117,6 +122,7 @@
         'browser/aw_browser_context.h',
         'browser/aw_browser_main_parts.cc',
         'browser/aw_browser_main_parts.h',
+        'browser/aw_browser_permission_request_delegate.h',
         'browser/aw_contents_client_bridge_base.cc',
         'browser/aw_contents_client_bridge_base.h',
         'browser/aw_content_browser_client.cc',
@@ -149,18 +155,25 @@
         'browser/aw_result_codes.h',
         'browser/aw_web_preferences_populater.cc',
         'browser/aw_web_preferences_populater.h',
+        'browser/aw_web_resource_response.cc',
+        'browser/aw_web_resource_response.h',
+        'browser/browser_view_renderer.cc',
         'browser/browser_view_renderer.h',
+        'browser/browser_view_renderer_client.h',
+        'browser/deferred_gpu_command_service.cc',
+        'browser/deferred_gpu_command_service.h',
         'browser/find_helper.cc',
         'browser/find_helper.h',
+        'browser/global_tile_manager.cc',
+        'browser/global_tile_manager.h',
+        'browser/global_tile_manager_client.h',
         'browser/gpu_memory_buffer_factory_impl.cc',
         'browser/gpu_memory_buffer_factory_impl.h',
+        'browser/hardware_renderer.cc',
+        'browser/hardware_renderer.h',
         'browser/icon_helper.cc',
         'browser/icon_helper.h',
-        'browser/in_process_view_renderer.cc',
-        'browser/in_process_view_renderer.h',
         'browser/input_stream.h',
-        'browser/intercepted_request_data.cc',
-        'browser/intercepted_request_data.h',
         'browser/jni_dependency_factory.h',
         'browser/gl_view_renderer_manager.cc',
         'browser/gl_view_renderer_manager.h',
@@ -177,6 +190,8 @@
         'browser/net/init_native_callback.h',
         'browser/net/input_stream_reader.cc',
         'browser/net/input_stream_reader.h',
+        'browser/parent_output_surface.cc',
+        'browser/parent_output_surface.h',
         'browser/renderer_host/aw_render_view_host_ext.cc',
         'browser/renderer_host/aw_render_view_host_ext.h',
         'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
@@ -186,6 +201,8 @@
         'browser/scoped_allow_wait_for_legacy_web_view_api.h',
         'browser/scoped_app_gl_state_restore.cc',
         'browser/scoped_app_gl_state_restore.h',
+        'browser/shared_renderer_state.cc',
+        'browser/shared_renderer_state.h',
         'common/android_webview_message_generator.cc',
         'common/android_webview_message_generator.h',
         'common/aw_content_client.cc',
@@ -195,6 +212,7 @@
         'common/aw_resource.h',
         'common/aw_switches.cc',
         'common/aw_switches.h',
+        'common/devtools_instrumentation.h',
         'common/print_messages.cc',
         'common/print_messages.h',
         'common/render_view_messages.cc',
@@ -208,31 +226,82 @@
         'public/browser/draw_gl.h',
         'renderer/aw_content_renderer_client.cc',
         'renderer/aw_content_renderer_client.h',
+        'renderer/aw_execution_termination_filter.cc',
+        'renderer/aw_execution_termination_filter.h',
         'renderer/aw_key_systems.cc',
         'renderer/aw_key_systems.h',
+        'renderer/aw_permission_client.cc',
+        'renderer/aw_permission_client.h',
         'renderer/aw_render_process_observer.cc',
         'renderer/aw_render_process_observer.h',
+        'renderer/aw_render_frame_ext.cc',
+        'renderer/aw_render_frame_ext.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_web_view_helper.cc',
         'renderer/print_web_view_helper.h',
         'renderer/print_web_view_helper_android.cc',
         'renderer/print_web_view_helper_linux.cc',
+        'renderer/print_render_frame_observer.cc',
+        'renderer/print_render_frame_observer.h',
       ],
     },
-    {
-      'target_name': 'android_webview_java',
-      'type': 'none',
-      'dependencies': [
-        '../components/components.gyp:navigation_interception_java',
-        '../components/components.gyp:web_contents_delegate_android_java',
-        '../content/content.gyp:content_java',
-        '../ui/android/ui_android.gyp:ui_java',
+  ],
+  'conditions': [
+    ['android_webview_build==0', {
+      'includes': [
+        'android_webview_tests.gypi',
       ],
-      'variables': {
-        'java_in_dir': '../android_webview/java',
-      },
-      'includes': [ '../build/java.gypi' ],
-    },
+      'targets': [
+        {
+          'target_name': 'android_webview_java',
+          'type': 'none',
+          'dependencies': [
+            '../components/components.gyp:navigation_interception_java',
+            '../components/components.gyp:web_contents_delegate_android_java',
+            '../content/content.gyp:content_java',
+            '../ui/android/ui_android.gyp:ui_java',
+          ],
+          'variables': {
+            'java_in_dir': '../android_webview/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+      ],
+     }, { # android_webview_build==1
+      'targets': [
+        {
+          'target_name': 'android_webview_jarjar_ui_resources',
+          'android_unmangled_name': 1,
+          'type': 'none',
+          'variables': {
+            'res_dir': '../ui/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_jarjar_content_resources',
+          'android_unmangled_name': 1,
+          'type': 'none',
+          'variables': {
+            'res_dir': '../content/public/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_resources',
+          'type': 'none',
+          'android_unmangled_name': 1,
+          'dependencies': [
+            '../content/content.gyp:content_strings_grd',
+            '../ui/android/ui_android.gyp:ui_strings_grd',
+            'android_webview_jarjar_ui_resources',
+            'android_webview_jarjar_content_resources'
+          ],
+        },
+      ],
+    }],
   ],
 }
diff --git a/chromium/android_webview/android_webview_tests.gypi b/chromium/android_webview/android_webview_tests.gypi
index 58855718a4c..390732ad202 100644
--- a/chromium/android_webview/android_webview_tests.gypi
+++ b/chromium/android_webview/android_webview_tests.gypi
@@ -19,9 +19,17 @@
         'additional_input_paths': [
           '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',
+          '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
           '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
         ],
+        'conditions': [
+          ['icu_use_data_file_flag==1', {
+            'additional_input_paths': [
+              '<(PRODUCT_DIR)/icudtl.dat',
+            ],
+          }],
+        ],
       },
       'copies': [
         {
@@ -29,8 +37,16 @@
           'files': [
             '<(java_in_dir)/assets/asset_file.html',
             '<(java_in_dir)/assets/asset_icon.png',
+            '<(java_in_dir)/assets/cookie_test.html',
             '<(java_in_dir)/assets/full_screen_video_test.html',
           ],
+	  'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'files': [
+                '<(PRODUCT_DIR)/icudtl.dat',
+              ],
+	    }],
+          ],
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
@@ -38,7 +54,7 @@
     {
       # android_webview_apk creates a .jar as a side effect. Any java
       # targets that need that .jar in their classpath should depend on this
-      # target. For more details see the chromium_testshell_java target.
+      # target. For more details see the chrome_shell_apk_java target.
       'target_name': 'android_webview_apk_java',
       'type': 'none',
       'dependencies': [
@@ -72,8 +88,9 @@
         '../testing/android/native_test.gyp:native_test_native_code',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../ui/ui.gyp:ui_base_jni_headers',
+        '../ui/base/ui_base.gyp:ui_base_jni_headers',
         'android_webview_common',
+        'android_webview_unittests_jni',
       ],
       'include_dirs': [
         '..',
@@ -81,12 +98,17 @@
         '<(SHARED_INTERMEDIATE_DIR)/android_webview_unittests',
       ],
       'sources': [
+        'browser/aw_static_cookie_policy_unittest.cc',
         'browser/aw_form_database_service_unittest.cc',
+        'browser/global_tile_manager_unittest.cc',
         'browser/net/android_stream_reader_url_request_job_unittest.cc',
         'browser/net/input_stream_reader_unittest.cc',
         'lib/main/webview_tests.cc',
+        'native/aw_contents_client_bridge_unittest.cc',
         'native/input_stream_unittest.cc',
-        'native/state_serializer_unittests.cc',
+        'native/permission/media_access_permission_request_unittest.cc',
+        'native/permission/permission_request_handler_unittest.cc',
+        'native/state_serializer_unittest.cc',
       ],
     },
     {
@@ -107,6 +129,7 @@
       'type': 'none',
       'sources': [
           '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
+          '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java',
       ],
       'variables': {
         'jni_gen_package': 'android_webview_unittests',
@@ -119,11 +142,9 @@
       'dependencies': [
         'android_webview_unittest_java',
         'android_webview_unittests',
-        'android_webview_unittests_jni',
       ],
       'variables': {
         'test_suite_name': 'android_webview_unittests',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)',
       },
       'includes': [ '../build/apk_test.gypi' ],
     },
diff --git a/chromium/android_webview/build/jarjar_resources.gypi b/chromium/android_webview/build/jarjar_resources.gypi
new file mode 100644
index 00000000000..17838c6a767
--- /dev/null
+++ b/chromium/android_webview/build/jarjar_resources.gypi
@@ -0,0 +1,50 @@
+# Copyright 2014 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.
+#
+# This file is meant to be included into a target to provide a rule
+# to run the equivalent of jarjar on Java resources (layout.xml files).
+#
+# To use this, create a gyp target with the following form:
+# {
+#   'target_name': 'my-package_java',
+#   'type': 'none',
+#   'variables': {
+#     'java_in_dir': 'path/to/package/root',
+#   },
+#   'includes': ['path/to/this/gypi/file'],
+# }
+#
+# Required variables:
+#  res_dir - The top-level resources folder.
+#  rules_file - Path to the file containing jar-jar rules.
+
+{
+  'variables': {
+    'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
+    'jarjar_stamp': '<(intermediate_dir)/jarjar_resources.stamp',
+    'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
+  },
+  'actions': [{
+      'action_name': 'jarjar resources',
+      'message': 'Copying and jar-jaring resources for <(_target_name)',
+      'variables': {
+        'out_dir': '<(intermediate_dir)/jarjar_res',
+      },
+      'inputs': [
+        '<(DEPTH)/build/android/gyp/util/build_utils.py',
+        '<(DEPTH)/build/android/gyp/jarjar_resources.py',
+        '>@(resource_input_paths)',
+      ],
+      'outputs': [
+          '<(jarjar_stamp)',
+      ],
+      'action': [
+        'python', '../build/android/gyp/jarjar_resources.py',
+        '--input-dir', '<(res_dir)',
+        '--output-dir', '<(out_dir)',
+        '--rules-path', '<(rules_file)',
+        '--stamp', '<(jarjar_stamp)',
+      ]
+  }],
+}
diff --git a/chromium/android_webview/native/webview_native.gyp b/chromium/android_webview/native/webview_native.gyp
index 52f4820852b..f8c70d98806 100644
--- a/chromium/android_webview/native/webview_native.gyp
+++ b/chromium/android_webview/native/webview_native.gyp
@@ -12,31 +12,32 @@
       'dependencies': [
         '../../base/base.gyp:base_static',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../cc/cc.gyp:cc',
         '../../components/components.gyp:autofill_content_browser',
         '../../components/components.gyp:web_contents_delegate_android',
-        '../../cc/cc.gyp:cc',
+        '../../content/content.gyp:content_common',
         '../../net/net.gyp:net',
         '../../skia/skia.gyp:skia',
+        '../../ui/base/ui_base.gyp:ui_base',
         '../../ui/gfx/gfx.gyp:gfx',
-        '../../ui/ui.gyp:ui',
-        '../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../../ui/gfx/gfx.gyp:gfx_geometry',
         '../../webkit/common/webkit_common.gyp:webkit_common',
         '../../webkit/storage_browser.gyp:webkit_storage_browser',
         '../../webkit/storage_common.gyp:webkit_storage_common',
+        '../../third_party/openssl/openssl.gyp:openssl',
         'android_webview_native_jni',
       ],
       'include_dirs': [
         '../..',
         '../../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/android_webview',
       ],
       'sources': [
         'android_protocol_handler.cc',
         'android_protocol_handler.h',
         'android_webview_jni_registrar.cc',
         'android_webview_jni_registrar.h',
-        'aw_autofill_manager_delegate.cc',
-        'aw_autofill_manager_delegate.h',
+        'aw_autofill_client.cc',
+        'aw_autofill_client.h',
         'aw_browser_dependency_factory.cc',
         'aw_browser_dependency_factory.h',
         'aw_contents.cc',
@@ -45,12 +46,12 @@
         'aw_contents_client_bridge.h',
         'aw_contents_io_thread_client_impl.cc',
         'aw_contents_io_thread_client_impl.h',
+        'aw_contents_statics.cc',
+        'aw_contents_statics.h',
         'aw_dev_tools_server.cc',
         'aw_dev_tools_server.h',
         'aw_form_database.cc',
         'aw_form_database.h',
-        'aw_geolocation_permission_context.cc',
-        'aw_geolocation_permission_context.h',
         'aw_http_auth_handler.cc',
         'aw_http_auth_handler.h',
         'aw_pdf_exporter.cc',
@@ -69,27 +70,38 @@
         'aw_web_contents_view_delegate.h',
         'aw_web_preferences_populater_impl.cc',
         'aw_web_preferences_populater_impl.h',
+        'aw_web_resource_response_impl.cc',
+        'aw_web_resource_response_impl.h',
         'cookie_manager.cc',
         'cookie_manager.h',
         'input_stream_impl.cc',
         'input_stream_impl.h',
-        'intercepted_request_data_impl.cc',
-        'intercepted_request_data_impl.h',
         'java_browser_view_renderer_helper.cc',
         'java_browser_view_renderer_helper.h',
         'net_init_native_callback.cc',
+        'permission/aw_permission_request.cc',
+        'permission/aw_permission_request.h',
+        'permission/aw_permission_request_delegate.cc',
+        'permission/aw_permission_request_delegate.h',
+        'permission/media_access_permission_request.cc',
+        'permission/media_access_permission_request.h',
+        'permission/permission_request_handler.cc',
+        'permission/permission_request_handler.h',
+        'permission/permission_request_handler_client.cc',
+        'permission/permission_request_handler_client.h',
+        'permission/simple_permission_request.cc',
+        'permission/simple_permission_request.h',
         'state_serializer.cc',
         'state_serializer.h',
       ],
-    },
-    {
-      'target_name': 'input_stream_android_jar_jni_headers',
-      'type': 'none',
-      'variables': {
-        'jni_gen_package': 'android_webview',
-        'input_java_class': 'java/io/InputStream.class',
-      },
-      'includes': [ '../../build/jar_file_jni_generator.gypi' ],
+      'conditions': [
+        ['video_hole==1', {
+          'sources': [
+            'external_video_surface_container_impl.cc',
+            'external_video_surface_container_impl.h',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'cancellation_signal_android_jar_jni_headers',
@@ -105,10 +117,11 @@
       'type': 'none',
       'sources': [
           '../java/src/org/chromium/android_webview/AndroidProtocolHandler.java',
-          '../java/src/org/chromium/android_webview/AwAutofillManagerDelegate.java',
+          '../java/src/org/chromium/android_webview/AwAutofillClient.java',
           '../java/src/org/chromium/android_webview/AwContents.java',
           '../java/src/org/chromium/android_webview/AwContentsClientBridge.java',
           '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java',
+          '../java/src/org/chromium/android_webview/AwContentsStatics.java',
           '../java/src/org/chromium/android_webview/AwCookieManager.java',
           '../java/src/org/chromium/android_webview/AwDevToolsServer.java',
           '../java/src/org/chromium/android_webview/AwFormDatabase.java',
@@ -119,16 +132,17 @@
           '../java/src/org/chromium/android_webview/AwResource.java',
           '../java/src/org/chromium/android_webview/AwSettings.java',
           '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java',
-          '../java/src/org/chromium/android_webview/InterceptedRequestData.java',
+          '../java/src/org/chromium/android_webview/AwWebResourceResponse.java',
+          '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java',
+          '../java/src/org/chromium/android_webview/InputStreamUtil.java',
           '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java',
+          '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java',
       ],
       'variables': {
         'jni_gen_package': 'android_webview',
-        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../../build/jni_generator.gypi' ],
       'dependencies': [
-        'input_stream_android_jar_jni_headers',
         'cancellation_signal_android_jar_jni_headers',
       ],
     },