Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3

1 files changed, 32 insertions, 15 deletions

diff --git a/GypAndroid.linux-x86_64.mk b/GypAndroid.linux-x86_64.mk
index c87335bd92..bc60b0a5ed 100644
--- a/GypAndroid.linux-x86_64.mk
+++ b/GypAndroid.linux-x86_64.mk
@@ -7,6 +7,7 @@ GYP_VAR_PREFIX ?=
 
 include $(LOCAL_PATH)/android_webview/android_webview_common.target.linux-x86_64.mk
 include $(LOCAL_PATH)/android_webview/android_webview_pak.target.linux-x86_64.mk
+include $(LOCAL_PATH)/android_webview/android_webview_strings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.linux-x86_64.mk
 include $(LOCAL_PATH)/android_webview/native/android_webview_native_jni.target.linux-x86_64.mk
 include $(LOCAL_PATH)/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
@@ -41,6 +42,7 @@ include $(LOCAL_PATH)/components/data_reduction_proxy_common.target.linux-x86_64
 include $(LOCAL_PATH)/components/navigation_interception.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/os_crypt.target.linux-x86_64.mk
+include $(LOCAL_PATH)/components/pref_registry.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/tracing.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/user_prefs.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/visitedlink_browser.target.linux-x86_64.mk
@@ -62,6 +64,7 @@ include $(LOCAL_PATH)/content/content_gpu.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/content_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/content_renderer.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/content_resources.target.linux-x86_64.mk
+include $(LOCAL_PATH)/content/content_strings_grd.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/content_utility.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/gesture_event_type_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86_64.mk
@@ -71,7 +74,6 @@ include $(LOCAL_PATH)/content/popup_item_type_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/result_codes_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/screen_orientation_values_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/content/speech_recognition_error_java.target.linux-x86_64.mk
-include $(LOCAL_PATH)/content/webkit_version.target.linux-x86_64.mk
 include $(LOCAL_PATH)/courgette/courgette_lib.target.linux-x86_64.mk
 include $(LOCAL_PATH)/crypto/crypto.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gin/gin.target.linux-x86_64.mk
@@ -109,12 +111,13 @@ include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.linux-x86_64.mk
 include $(LOCAL_PATH)/mojo/mojo_js_bindings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.linux-x86_64.mk
 include $(LOCAL_PATH)/mojo/mojo_service_manager.target.linux-x86_64.mk
-include $(LOCAL_PATH)/mojo/mojo_shell_bindings.target.linux-x86_64.mk
+include $(LOCAL_PATH)/mojo/mojo_service_provider_bindings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/mojo/mojo_system_impl.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/cert_verify_status_android_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/certificate_mime_types_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/http_server.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/net.target.linux-x86_64.mk
+include $(LOCAL_PATH)/net/net_derived_sources.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/net_errors_java.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/net_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/net/net_resources.target.linux-x86_64.mk
@@ -135,16 +138,21 @@ include $(LOCAL_PATH)/skia/skia_opts.target.linux-x86_64.mk
 include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.linux-x86_64.mk
 include $(LOCAL_PATH)/sql/sql.target.linux-x86_64.mk
 include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_core_generated_aggregate.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_modules_generated_aggregate.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_jinja_templates.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_lex_yacc_tables.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core_bindings_generated.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/generated_bindings.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core/interfaces_info_individual_core.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core/v8/bindings_core_generated.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core/v8/bindings_core_generated_aggregate.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core/v8/bindings_core_generated_individual.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/generated_idls.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/global_constructors_idls.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/individual_generated_bindings.target.linux-x86_64.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interfaces_info.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/modules/interfaces_info.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/modules/interfaces_info_individual_modules.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/modules/v8/bindings_modules_generated.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/modules/v8/bindings_modules_generated_aggregate.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/modules/v8/bindings_modules_generated_individual.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/scripts/cached_jinja_templates.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/scripts/cached_lex_yacc_tables.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core_bindings_generated.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/generated_testing_idls.target.linux-x86_64.mk
@@ -188,7 +196,9 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.li
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/supported_css_properties.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/modules/make_modules_generated.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules_bindings_generated.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_common.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_heap_asm_stubs.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_platform.target.linux-x86_64.mk
@@ -221,6 +231,7 @@ include $(LOCAL_PATH)/third_party/icu/icuuc.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/icu/system_icu.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/khronos/khronos_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/leveldatabase/leveldatabase.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/libaddressinput/libaddressinput_util.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/libevent/libevent.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/libjingle/libjingle.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/libjingle/libjingle_p2p_constants.target.linux-x86_64.mk
@@ -266,6 +277,7 @@ include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/usrsctp/usrsctplib.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/webrtc/base/webrtc_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/webrtc/common_audio/common_audio.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/webrtc/common_audio/common_audio_sse2.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/webrtc/common_video/common_video.target.linux-x86_64.mk
@@ -303,6 +315,8 @@ include $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/cpu_features_and
 include $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/system_wrappers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/webrtc/video_engine/video_engine_core.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/webrtc/voice_engine/voice_engine.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/webrtc/webrtc.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/webrtc/webrtc_common.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/yasm/config_sources.host.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/yasm/generate_files.host.linux-x86_64.mk
@@ -321,13 +335,15 @@ include $(LOCAL_PATH)/tools/json_schema_compiler/api_gen_util.target.linux-x86_6
 include $(LOCAL_PATH)/ui/accessibility/accessibility.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/accessibility/ax_gen.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/android/bitmap_format_java.target.linux-x86_64.mk
+include $(LOCAL_PATH)/ui/android/ui_strings_grd.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/android/window_open_disposition_java.target.linux-x86_64.mk
-include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.linux-x86_64.mk
+include $(LOCAL_PATH)/ui/events/ipc/events_ipc.target.linux-x86_64.mk
+include $(LOCAL_PATH)/ui/events/platform/events_platform.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/gfx/gfx_geometry.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/gfx/gfx_jni_headers.target.linux-x86_64.mk
@@ -338,17 +354,18 @@ include $(LOCAL_PATH)/ui/native_theme/native_theme.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/resources/ui_resources.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/shell_dialogs/shell_dialogs.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86_64.mk
+include $(LOCAL_PATH)/ui/strings/ui_strings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/surface/surface.target.linux-x86_64.mk
 include $(LOCAL_PATH)/url/url_lib.target.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/generate_trig_table.host.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.linux-x86_64.mk
-include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.x64.host.linux-x86_64.mk
+include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.host.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8.target.linux-x86_64.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_base.x64.host.linux-x86_64.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_base.x64.target.linux-x86_64.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.host.linux-x86_64.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.x64.host.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.x64.target.linux-x86_64.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.x64.host.linux-x86_64.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-x86_64.mk
 include $(LOCAL_PATH)/webkit/child/overscroller_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/webkit/child/webkit_child.target.linux-x86_64.mk