Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5

1 files changed, 21 insertions, 8 deletions

diff --git a/GypAndroid.darwin-mips.mk b/GypAndroid.darwin-mips.mk
index fc3b81bfbc..887a0b77ea 100644
--- a/GypAndroid.darwin-mips.mk
+++ b/GypAndroid.darwin-mips.mk
@@ -15,7 +15,7 @@ include $(LOCAL_PATH)/android_webview/native/webview_native.target.darwin-mips.m
 include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_i18n.target.darwin-mips.mk
-include $(LOCAL_PATH)/base/base_java_activity_state.target.darwin-mips.mk
+include $(LOCAL_PATH)/base/base_java_application_state.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_java_memory_pressure_level_list.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-mips.mk
@@ -31,10 +31,11 @@ include $(LOCAL_PATH)/components/autofill_core_browser.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/autofill_core_common.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/autofill_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/autofill_regexes.target.darwin-mips.mk
+include $(LOCAL_PATH)/components/component_resources.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/component_strings.target.darwin-mips.mk
-include $(LOCAL_PATH)/components/encryptor.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/navigation_interception.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.darwin-mips.mk
+include $(LOCAL_PATH)/components/os_crypt.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/tracing.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/user_prefs.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/visitedlink_browser.target.darwin-mips.mk
@@ -61,7 +62,9 @@ include $(LOCAL_PATH)/content/motionevent_jni_headers.target.darwin-mips.mk
 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/speech_recognition_error_java.target.darwin-mips.mk
+include $(LOCAL_PATH)/content/webkit_version.target.darwin-mips.mk
 include $(LOCAL_PATH)/crypto/crypto.target.darwin-mips.mk
 include $(LOCAL_PATH)/gin/gin.target.darwin-mips.mk
 include $(LOCAL_PATH)/google_apis/google_apis.target.darwin-mips.mk
@@ -85,6 +88,11 @@ 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_common_lib.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_lib.target.darwin-mips.mk
+include $(LOCAL_PATH)/mojo/mojo_system.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
 include $(LOCAL_PATH)/net/http_server.target.darwin-mips.mk
@@ -106,9 +114,13 @@ include $(LOCAL_PATH)/skia/skia_opts.target.darwin-mips.mk
 include $(LOCAL_PATH)/sql/sql.target.darwin-mips.mk
 include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/aggregate_generated_bindings.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_jinja_templates.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_yacc_tables.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/event_interfaces.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/generated_bindings.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/global_constructors_idls.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/individual_generated_bindings.target.darwin-mips.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interfaces_info.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/config.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
@@ -129,6 +141,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_rendering.target.da
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_svg.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_audits_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.darwin-mips.mk
@@ -159,6 +172,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.darwin-mips.mk
 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_skia_config.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/angle/src/commit_id.target.darwin-mips.mk
@@ -215,15 +229,18 @@ include $(LOCAL_PATH)/third_party/zlib/zlib.target.darwin-mips.mk
 include $(LOCAL_PATH)/tools/json_schema_compiler/api_gen_util.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/accessibility/accessibility.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/accessibility/ax_gen.target.darwin-mips.mk
+include $(LOCAL_PATH)/ui/android/bitmap_format_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/android/window_open_disposition_java.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-mips.mk
+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/gfx/gfx.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gfx/gfx_geometry.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gfx/gfx_jni_headers.target.darwin-mips.mk
-include $(LOCAL_PATH)/ui/gfx/gfx_view_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gl/gl.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.darwin-mips.mk
@@ -232,8 +249,6 @@ include $(LOCAL_PATH)/ui/resources/ui_resources.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/snapshot/snapshot.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/surface/surface.target.darwin-mips.mk
-include $(LOCAL_PATH)/ui/ui.target.darwin-mips.mk
-include $(LOCAL_PATH)/ui/ui_base_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/url/url_lib.target.darwin-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/generate_trig_table.host.darwin-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.darwin-mips.mk
@@ -246,8 +261,6 @@ 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/user_agent/user_agent.target.darwin-mips.mk
-include $(LOCAL_PATH)/webkit/common/user_agent/webkit_version.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/common/webkit_common.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-mips.mk
 include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-mips.mk