Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/.gitignore b/.gitignore
index fdc011a..dd9e785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
*.Makefile
*.gypcmd
-*.host.mk
+*.mk
*.ncb
*.ninja
*.opensdf
@@ -10,7 +10,6 @@
*.sdf
*.sln
*.suo
-*.target.mk
*.targets
*.user
*.vcproj
@@ -24,6 +23,7 @@
*_proto.xml
*_proto_cpp.xml
*~
+!Android.mk
.*.sw?
.DS_Store
.classpath
@@ -40,6 +40,7 @@
v8.log
/Makefile
/_out
+/arm-sysroot
/ash/resources/google_wallpapers/
/breakpad/src/
/build/Debug
@@ -51,9 +52,13 @@
# The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
/c
/ceee/internal/
-/chrome/Hammer
+/base/base_unittests_run.xml
+/chrome/app/policy/chrome_settings_proto_compile.xml
+/chrome/app/policy/chrome_settings_proto_generated_compile.xml
/chrome/app/policy/cloud_policy_backend_header_compile.xml
/chrome/app/policy/cloud_policy_proto_compile.xml
+/chrome/app/policy/cloud_policy_proto_generated_compile.xml
+/chrome/app/policy/policy_proto_compile.xml
/chrome/app/theme/default_100_percent/google_chrome
/chrome/app/theme/default_200_percent/google_chrome
/chrome/app/theme/google_chrome
@@ -64,9 +69,12 @@
/chrome/browser/performance_monitor/performance_monitor.xml
/chrome/browser/protector/internal
/chrome/browser/resources/software_rendering_list
+/chrome/browser/search_engines/prepopulated_engines.xml
/chrome/browser/spellchecker/internal
+/chrome/browser_tests_run.xml
/chrome/chrome_version_resources.xml
/chrome/common/extensions/api/api.xml
+/chrome/Hammer
/chrome/installer/linux
/chrome/installer/mac/internal
/chrome/installer/mac/third_party/xz/xz
@@ -78,8 +86,11 @@
/chrome/setup.xml
/chrome/setup_unittests.xml
/chrome/supplement.gypi
+/chrome/sync_integration_tests_run.xml
/chrome/test/chromeos/autotest/files/client/deps/chrome_test/test_src/
+/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/test_src/
/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/test_src/
+/chrome/test/chromeos/autotest/files/client/deps/telemetry_dep/test_src/
/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin
/chrome/test/data/firefox2_profile/searchplugins
/chrome/test/data/firefox2_searchplugins
@@ -93,18 +104,23 @@
/chrome/test/data/perf/frame_rate/content
/chrome/test/data/perf/frame_rate/private
/chrome/test/data/perf/private/
+/chrome/test/data/perf/third_party/
/chrome/test/data/plugin/
/chrome/test/data/pyauto_private
/chrome/tools/memory
/chrome/tools/test/reference_build
+/chrome/unit_tests_run.xml
/chrome_frame/chrome_frame_ie.xml
+/chrome_frame/chrome_frame_launcher_version_resources.xml
+/chrome_frame/chrome_frame_version_resources.xml
/chrome_frame/tools/test/reference_build
+/cloud_print/cloud_print_version_resources.xml
/content/test/data/layout_tests/
/content/test/data/plugin/
/data
/delegate_execute
-/googleurl
/google_apis/internal
+/googleurl
/gpu/gles2_conform_test
/gyp-mac-tool
/hideout
@@ -126,12 +142,15 @@
/ppapi/native_client/src/shared/ppapi_proxy/ppruntime_lib.xml
/ppapi/native_client/src/trusted/plugin/ppGoogleNaClPluginChrome.xml
/remoting/appengine/
+/remoting/host/installer/linux/internal/
/remoting/proto/chromotocol_proto_lib.xml
/remoting/proto/trace_proto_lib.xml
/remoting/remoting_elevated_controller.xml
/remoting/remoting_host_event_logger.xml
/remoting/remoting_host_installation.xml
/remoting/remoting_host_installation_unittest.xml
+/remoting/remoting_lib_idl.xml
+/remoting/remoting_lib_rc.xml
/remoting/remoting_me2me_host.xml
/remoting/remoting_version_resources.xml
/remoting/tools/internal/
@@ -142,38 +161,49 @@
/testing/gtest
/testing/iossim/third_party/
/testserver.log
-/third_party/GTM
-/third_party/WebKit
+/third_party/accessibility-developer-tools/
/third_party/adobe/flash/binaries
/third_party/adobe/flash/symbols
/third_party/amd/
-/third_party/angle
/third_party/android_tools/
+/third_party/angle
/third_party/aosp
+/third_party/apache-mime4j
/third_party/asan
/third_party/bidichecker
/third_party/bison
+/third_party/cacheinvalidation/cacheinvalidation_unittests_run.xml
/third_party/cacheinvalidation/src
/third_party/chromeos_login_manager
/third_party/chromeos_text_input
+/third_party/chromite
/third_party/cros
/third_party/cros_dbus_cplusplus/source
/third_party/cros_system_api
/third_party/cygwin
/third_party/directxsdk
/third_party/drmemory
+/third_party/eyesfree/src
/third_party/ffmpeg
+/third_party/findbugs
/third_party/flac
/third_party/freetype
+/third_party/freetype2/src
/third_party/gles2_conform
/third_party/gnu_binutils/
/third_party/gold
/third_party/googlemac
/third_party/gperf
+/third_party/GTM
+/third_party/guava/src
+/third_party/httpcomponents-client
+/third_party/httpcomponents-core
/third_party/hunspell
/third_party/hunspell_dictionaries
/third_party/icu
+/third_party/jarjar
/third_party/jsoncpp/source
+/third_party/jsr-305/src
/third_party/leveldatabase/src
/third_party/leveldb
/third_party/libexif/sources
@@ -194,7 +224,6 @@
/third_party/lss
/third_party/mingw-w64
/third_party/mkl
-/third_party/mozc
/third_party/mt19937ar
/third_party/mtpd/source/
/third_party/nacl_sdk_binaries/
@@ -210,13 +239,14 @@
/third_party/ppapi
/third_party/psyco_win32
/third_party/pthreads-win32
+/third_party/pyelftools
/third_party/pyftpdlib/src
-/third_party/pywebsocket/src
/third_party/pylib
/third_party/pymox/src
/third_party/python_24
/third_party/python_26
/third_party/pywebsocket/src
+/third_party/pywebsocket/src
/third_party/safe_browsing/testing
/third_party/scons-2.0.1
/third_party/sfntly
@@ -229,12 +259,15 @@
/third_party/syzygy
/third_party/syzygy/binaries
/third_party/trace-viewer
+/third_party/tsan/
/third_party/undoview
+/third_party/usb_ids
/third_party/v8-i18n
/third_party/valgrind
/third_party/webdriver/pylib
/third_party/webdriver/python/selenium
/third_party/webgl_conformance
+/third_party/WebKit
/third_party/webpagereplay/
/third_party/webrtc
/third_party/webrtc/internal
@@ -260,14 +293,21 @@
/tools/tryserver
/tools/win/link_limiter/build
/ui/resources/aura/google_wallpapers
+/ui/surface/surface.xml
+/ui/surface/surface_gpu_tests.xml
/v8
-/webkit/Debug
-/webkit/Release
/webkit/data/bmp_decoder
/webkit/data/ico_decoder
/webkit/data/layout_tests/LayoutTests
/webkit/data/test_shell/plugins
/webkit/data/xbm_decoder
+/webkit/Debug
+/webkit/media/crypto/ppapi/cdm
+/webkit/Release
/webpagereplay_logs/
+/win8/delegate_execute/delegate_execute_version_resources.xml
+/win8/metro_driver/metro_driver_version_resources.xml
/x86-generic_out/
/xcodebuild
+cscope.*
+Session.vim