Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854

1 files changed, 12 insertions, 7 deletions

diff --git a/GypAndroid.darwin-mips.mk b/GypAndroid.darwin-mips.mk
index 558bbe165d..c6204c4cee 100644
--- a/GypAndroid.darwin-mips.mk
+++ b/GypAndroid.darwin-mips.mk
@@ -15,7 +15,6 @@ include $(LOCAL_PATH)/android_webview/android_webview_resources.target.darwin-mi
 include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.darwin-mips.mk
 include $(LOCAL_PATH)/android_webview/native/android_webview_native_jni.target.darwin-mips.mk
 include $(LOCAL_PATH)/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
-include $(LOCAL_PATH)/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/android_webview/native/webview_native.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base.target.darwin-mips.mk
@@ -80,6 +79,7 @@ include $(LOCAL_PATH)/content/page_transition_types_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/content/popup_item_type_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/content/result_codes_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/content/screen_orientation_values_java.target.darwin-mips.mk
+include $(LOCAL_PATH)/content/selection_event_type_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/content/speech_recognition_error_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/courgette/courgette_lib.target.darwin-mips.mk
 include $(LOCAL_PATH)/crypto/crypto.target.darwin-mips.mk
@@ -99,6 +99,7 @@ include $(LOCAL_PATH)/gpu/gpu_config.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/gpu_ipc.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/ipc/ipc.target.darwin-mips.mk
+include $(LOCAL_PATH)/ipc/mojo/ipc_mojo.target.darwin-mips.mk
 include $(LOCAL_PATH)/jingle/jingle_glue.target.darwin-mips.mk
 include $(LOCAL_PATH)/media/media.target.darwin-mips.mk
 include $(LOCAL_PATH)/media/media_android_imageformat_list.target.darwin-mips.mk
@@ -106,15 +107,17 @@ include $(LOCAL_PATH)/media/media_android_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/media/player_android.target.darwin-mips.mk
 include $(LOCAL_PATH)/media/shared_memory_support.target.darwin-mips.mk
 include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.darwin-mips.mk
+include $(LOCAL_PATH)/mojo/mojo_application_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_common_lib.target.darwin-mips.mk
+include $(LOCAL_PATH)/mojo/mojo_content_handler_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_cpp_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_environment_chromium.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_js_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.darwin-mips.mk
+include $(LOCAL_PATH)/mojo/mojo_network_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_none.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_service_manager.target.darwin-mips.mk
-include $(LOCAL_PATH)/mojo/mojo_service_provider_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/mojo/mojo_system_impl.target.darwin-mips.mk
 include $(LOCAL_PATH)/net/cert_verify_status_android_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/net/certificate_mime_types_java.target.darwin-mips.mk
@@ -129,6 +132,9 @@ include $(LOCAL_PATH)/printing/printing.target.darwin-mips.mk
 include $(LOCAL_PATH)/printing/printing_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/sandbox/sandbox.target.darwin-mips.mk
 include $(LOCAL_PATH)/sandbox/sandbox_services.target.darwin-mips.mk
+include $(LOCAL_PATH)/sandbox/sandbox_services_headers.target.darwin-mips.mk
+include $(LOCAL_PATH)/sandbox/seccomp_bpf.target.darwin-mips.mk
+include $(LOCAL_PATH)/sandbox/seccomp_bpf_helpers.target.darwin-mips.mk
 include $(LOCAL_PATH)/sdch/sdch.target.darwin-mips.mk
 include $(LOCAL_PATH)/skia/skia.target.darwin-mips.mk
 include $(LOCAL_PATH)/skia/skia_chrome.target.darwin-mips.mk
@@ -156,13 +162,9 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/scripts/cached_jinja_te
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/scripts/cached_lex_yacc_tables.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/core_event_interfaces.target.darwin-mips.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/generated_testing_idls.target.darwin-mips.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/injected_canvas_script_source.target.darwin-mips.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/injected_script_source.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_instrumentation_sources.target.darwin-mips.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_overlay_page.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_protocol_sources.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/make_core_generated.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore.target.darwin-mips.mk
@@ -177,6 +179,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_audits_module.tar
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_console_module.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_core_module.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_devices_module.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_documentation_module.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_elements_module.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_extensions_module.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_heap_snapshot_worker_module.target.darwin-mips.mk
@@ -212,6 +215,7 @@ include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/public/blink_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_resources.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/angle/src/commit_id.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/angle/src/copy_scripts.target.darwin-mips.mk
@@ -219,6 +223,7 @@ include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/angle/src/translator.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/angle/src/translator_lib.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/boringssl/boringssl.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/brotli/brotli.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/fips181/fips181.target.darwin-mips.mk
@@ -324,6 +329,7 @@ include $(LOCAL_PATH)/ui/android/window_open_disposition_java.target.darwin-mips
 include $(LOCAL_PATH)/ui/base/ui_base.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.darwin-mips.mk
+include $(LOCAL_PATH)/ui/events/events.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/ipc/events_ipc.target.darwin-mips.mk
@@ -353,7 +359,6 @@ include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.target.darwin-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_libplatform.host.darwin-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.darwin-mips.mk
-include $(LOCAL_PATH)/webkit/child/overscroller_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/child/webkit_child.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/common/webkit_common.target.darwin-mips.mk