BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

8 files changed, 69 insertions, 24 deletions

diff --git a/chromium/android_webview/android_webview.gyp b/chromium/android_webview/android_webview.gyp
index 7b09e435f59..0ac4b8650ff 100644
--- a/chromium/android_webview/android_webview.gyp
+++ b/chromium/android_webview/android_webview.gyp
@@ -262,6 +262,7 @@
         '../ui/events/events.gyp:gesture_detection',
         '../ui/gl/gl.gyp:gl',
         '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
+        '../url/ipc/url_ipc.gyp:url_ipc',
         '../v8/tools/gyp/v8.gyp:v8',
         'android_webview_pak',
         'android_webview_version',
@@ -281,10 +282,10 @@
         'browser/aw_browser_permission_request_delegate.h',
         'browser/aw_browser_policy_connector.cc',
         'browser/aw_browser_policy_connector.h',
-        'browser/aw_contents_client_bridge_base.cc',
-        'browser/aw_contents_client_bridge_base.h',
         'browser/aw_content_browser_client.cc',
         'browser/aw_content_browser_client.h',
+        'browser/aw_contents_client_bridge_base.cc',
+        'browser/aw_contents_client_bridge_base.h',
         'browser/aw_contents_io_thread_client.h',
         'browser/aw_cookie_access_policy.cc',
         'browser/aw_cookie_access_policy.h',
@@ -308,8 +309,8 @@
         'browser/aw_message_port_message_filter.cc',
         'browser/aw_message_port_message_filter.h',
         'browser/aw_message_port_service.h',
-        'browser/aw_metrics_service_client.h',
         'browser/aw_metrics_service_client.cc',
+        'browser/aw_metrics_service_client.h',
         'browser/aw_permission_manager.cc',
         'browser/aw_permission_manager.h',
         'browser/aw_pref_store.cc',
@@ -326,9 +327,9 @@
         'browser/aw_render_thread_context_provider.h',
         'browser/aw_resource_context.cc',
         'browser/aw_resource_context.h',
+        'browser/aw_result_codes.h',
         'browser/aw_ssl_host_state_delegate.cc',
         'browser/aw_ssl_host_state_delegate.h',
-        'browser/aw_result_codes.h',
         'browser/aw_web_preferences_populater.cc',
         'browser/aw_web_preferences_populater.h',
         'browser/browser_view_renderer.cc',
@@ -340,18 +341,24 @@
         'browser/deferred_gpu_command_service.h',
         'browser/find_helper.cc',
         'browser/find_helper.h',
+        'browser/gl_view_renderer_manager.cc',
+        'browser/gl_view_renderer_manager.h',
         'browser/hardware_renderer.cc',
         'browser/hardware_renderer.h',
         'browser/icon_helper.cc',
         'browser/icon_helper.h',
         'browser/input_stream.h',
         'browser/jni_dependency_factory.h',
-        'browser/gl_view_renderer_manager.cc',
-        'browser/gl_view_renderer_manager.h',
         'browser/net/android_stream_reader_url_request_job.cc',
         'browser/net/android_stream_reader_url_request_job.h',
-        'browser/net/aw_http_user_agent_settings.h',
+        'browser/net/aw_cookie_store_wrapper.cc',
+        'browser/net/aw_cookie_store_wrapper.h',
         'browser/net/aw_http_user_agent_settings.cc',
+        'browser/net/aw_http_user_agent_settings.h',
+        'browser/net/aw_network_change_notifier.cc',
+        'browser/net/aw_network_change_notifier.h',
+        'browser/net/aw_network_change_notifier_factory.cc',
+        'browser/net/aw_network_change_notifier_factory.h',
         'browser/net/aw_network_delegate.cc',
         'browser/net/aw_network_delegate.h',
         'browser/net/aw_request_interceptor.cc',
@@ -372,6 +379,8 @@
         'browser/parent_compositor_draw_constraints.h',
         'browser/parent_output_surface.cc',
         'browser/parent_output_surface.h',
+        'browser/render_thread_manager.cc',
+        'browser/render_thread_manager.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',
@@ -379,8 +388,6 @@
         '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',
@@ -416,10 +423,10 @@
         'renderer/aw_message_port_client.h',
         'renderer/aw_print_web_view_helper_delegate.cc',
         'renderer/aw_print_web_view_helper_delegate.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_process_observer.cc',
+        'renderer/aw_render_process_observer.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_render_frame_observer.cc',
diff --git a/chromium/android_webview/android_webview_shell.gyp b/chromium/android_webview/android_webview_shell.gyp
index 0af0dbea239..f5a20d8593c 100644
--- a/chromium/android_webview/android_webview_shell.gyp
+++ b/chromium/android_webview/android_webview_shell.gyp
@@ -9,9 +9,9 @@
       'type': 'none',
       'variables': {
         'apk_name': 'SystemWebViewShell',
-        'java_in_dir': 'tools/WebViewShell',
-        'resource_dir': 'tools/WebViewShell/res',
-        'android_manifest_path': 'tools/WebViewShell/AndroidManifest.xml', # for lint
+        'java_in_dir': 'tools/system_webview_shell/apk',
+        'resource_dir': 'tools/system_webview_shell/apk/res',
+        'android_manifest_path': 'tools/system_webview_shell/apk/AndroidManifest.xml', # for lint
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -41,10 +41,10 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellPageCycler',
-        'java_in_dir': '../android_webview/tools/PageCycler',
+        'java_in_dir': '../android_webview/tools/system_webview_shell/page_cycler',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
-        'android_manifest_path': '../android_webview/tools/PageCycler/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/system_webview_shell/page_cycler/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -63,11 +63,11 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellLayoutTest',
-        'java_in_dir': '../android_webview/tools/WebViewShellTest',
+        'java_in_dir': '../android_webview/tools/system_webview_shell/layout_tests',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
         'isolate_file': 'system_webview_shell_test_apk.isolate',
-        'android_manifest_path': '../android_webview/tools/WebViewShellTest/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/system_webview_shell/layout_tests/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',
diff --git a/chromium/android_webview/android_webview_test_apk_run.isolate b/chromium/android_webview/android_webview_test_apk_run.isolate
index 331d405df82..eb2fdaa44da 100644
--- a/chromium/android_webview/android_webview_test_apk_run.isolate
+++ b/chromium/android_webview/android_webview_test_apk_run.isolate
@@ -8,9 +8,9 @@
   'variables': {
     'command': [
       '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
-       '--enable-platform-mode',
-       '-e', 'local',
-       '--apk-under-test', '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [
       '../third_party/proguard/lib/proguard.jar',
diff --git a/chromium/android_webview/android_webview_tests.gypi b/chromium/android_webview/android_webview_tests.gypi
index 6a2cf650250..d903882b5cc 100644
--- a/chromium/android_webview/android_webview_tests.gypi
+++ b/chromium/android_webview/android_webview_tests.gypi
@@ -34,7 +34,9 @@
           '<(asset_location)/full_screen_video_test.html',
           '<(asset_location)/full_screen_video_inside_div_test.html',
           '<(asset_location)/multiple_videos_test.html',
-          '<(asset_location)/video.mp4',
+          '<(asset_location)/platform-media-codec-test.html',
+          '<(asset_location)/video.3gp',
+          '<(asset_location)/video.webm',
           '<(asset_location)/visual_state_during_fullscreen_test.html',
           '<(asset_location)/visual_state_waits_for_js_test.html',
           '<(asset_location)/visual_state_waits_for_js_detached_test.html',
@@ -62,7 +64,9 @@
             '<(java_in_dir)/assets/full_screen_video_test.html',
             '<(java_in_dir)/assets/full_screen_video_inside_div_test.html',
             '<(java_in_dir)/assets/multiple_videos_test.html',
-            '<(java_in_dir)/assets/video.mp4',
+            '<(java_in_dir)/assets/platform-media-codec-test.html',
+            '<(java_in_dir)/assets/video.3gp',
+            '<(java_in_dir)/assets/video.webm',
             '<(java_in_dir)/assets/visual_state_during_fullscreen_test.html',
             '<(java_in_dir)/assets/visual_state_waits_for_js_test.html',
             '<(java_in_dir)/assets/visual_state_waits_for_js_detached_test.html',
@@ -146,6 +150,7 @@
         'browser/aw_form_database_service_unittest.cc',
         'browser/browser_view_renderer_unittest.cc',
         'browser/net/android_stream_reader_url_request_job_unittest.cc',
+        'browser/net/aw_cookie_store_wrapper_unittest.cc',
         'browser/net/input_stream_reader_unittest.cc',
         'browser/test/fake_window.cc',
         'browser/test/fake_window.h',
diff --git a/chromium/android_webview/android_webview_unittests_apk.isolate b/chromium/android_webview/android_webview_unittests_apk.isolate
index ca71aabef37..dc12ec5ff35 100644
--- a/chromium/android_webview/android_webview_unittests_apk.isolate
+++ b/chromium/android_webview/android_webview_unittests_apk.isolate
@@ -8,6 +8,7 @@
   'variables': {
     'command': [
       '<(PRODUCT_DIR)/bin/run_android_webview_unittests',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [
       '<(PRODUCT_DIR)/bin/run_android_webview_unittests',
diff --git a/chromium/android_webview/native/webview_native.gyp b/chromium/android_webview/native/webview_native.gyp
index 0b57caee359..7d6ee8d2a84 100644
--- a/chromium/android_webview/native/webview_native.gyp
+++ b/chromium/android_webview/native/webview_native.gyp
@@ -18,6 +18,7 @@
         '../../components/components.gyp:autofill_content_browser',
         '../../components/components.gyp:devtools_http_handler',
         '../../components/components.gyp:web_contents_delegate_android',
+        '../../components/components_strings.gyp:components_strings',
         '../../content/content.gyp:content_common',
         '../../media/media.gyp:player_android',
         '../../net/net.gyp:net',
@@ -63,6 +64,8 @@
         'aw_dev_tools_server.h',
         'aw_form_database.cc',
         'aw_form_database.h',
+        'aw_gl_functor.cc',
+        'aw_gl_functor.h',
         'aw_http_auth_handler.cc',
         'aw_http_auth_handler.h',
         'aw_locale_manager_impl.cc',
@@ -150,6 +153,7 @@
           '../java/src/org/chromium/android_webview/AwDebug.java',
           '../java/src/org/chromium/android_webview/AwDevToolsServer.java',
           '../java/src/org/chromium/android_webview/AwFormDatabase.java',
+          '../java/src/org/chromium/android_webview/AwGLFunctor.java',
           '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java',
           '../java/src/org/chromium/android_webview/AwMessagePortService.java',
           '../java/src/org/chromium/android_webview/AwMetricsServiceClient.java',
diff --git a/chromium/android_webview/system_webview_shell_layout_test_apk_run.isolate b/chromium/android_webview/system_webview_shell_layout_test_apk_run.isolate
new file mode 100644
index 00000000000..b099a6b0145
--- /dev/null
+++ b/chromium/android_webview/system_webview_shell_layout_test_apk_run.isolate
@@ -0,0 +1,28 @@
+# Copyright 2016 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.
+{
+  'includes': [
+    '../build/android/android.isolate',
+  ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_system_webview_shell_layout_test_apk',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+    ],
+    'files': [
+      '../third_party/proguard/lib/proguard.jar',
+      '<(PRODUCT_DIR)/host_forwarder',
+      '<(PRODUCT_DIR)/forwarder_dist/',
+      '<(PRODUCT_DIR)/apks/SystemWebView.apk',
+      '<(PRODUCT_DIR)/apks/SystemWebViewShell.apk',
+      '<(PRODUCT_DIR)/apks/SystemWebViewShellLayoutTest.apk',
+      '<(PRODUCT_DIR)/bin/run_system_webview_shell_layout_test_apk',
+      '<(PRODUCT_DIR)/test.lib.java/SystemWebViewShellLayoutTest.jar',
+      'system_webview_shell_test_apk.isolate',
+      'tools/WebViewShell/test/',
+    ]
+  },
+}
diff --git a/chromium/android_webview/system_webview_shell_test_apk.isolate b/chromium/android_webview/system_webview_shell_test_apk.isolate
index 85e85d36000..15f2a848974 100644
--- a/chromium/android_webview/system_webview_shell_test_apk.isolate
+++ b/chromium/android_webview/system_webview_shell_test_apk.isolate
@@ -7,7 +7,7 @@
     ['OS=="android"', {
       'variables': {
         'files': [
-          '<(DEPTH)/android_webview/tools/WebViewShell/test/',
+          '<(DEPTH)/android_webview/tools/system_webview_shell/test/data/',
           '<(DEPTH)/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt',
           '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing.html',
           '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt',