Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
diff --git a/.gitignore b/.gitignore
index 8b40107..8018387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@
.pydevproject
# Settings directory for eclipse
/.settings
+.checkstyle
cscope.*
Session.vim
tags
@@ -127,10 +128,12 @@
/chrome_frame/tools/test/reference_build
/cloud_print/cloud_print_version_resources.xml
/components/variations.xml
+/content/content_unittests_run.xml
/content/test/data/layout_tests/
/content/test/data/plugin/
/data
/delegate_execute
+/google_apis/gcm/gcm.xml
/google_apis/internal
/googleurl
/gpu/gles2_conform_test
@@ -173,6 +176,7 @@
/sandbox/linux/seccomp-legacy/
/sdch/open-vcdiff
/seccompsandbox
+/skia/tools/clusterfuzz-data/
/testing/gmock
/testing/gtest
/testing/iossim/third_party/
@@ -183,6 +187,7 @@
/third_party/amd/
/third_party/android_tools/
/third_party/android_tools_internal/
+/third_party/angle
/third_party/angle_dx11
/third_party/aosp
/third_party/apache-mime4j
@@ -224,10 +229,12 @@
/third_party/jsr-305/src
/third_party/leveldatabase/src
/third_party/leveldb
+/third_party/libaddressinput/src
/third_party/libexif/sources
/third_party/libjingle/source
/third_party/libjingle/source_internal
/third_party/libjpeg_turbo
+/third_party/liblouis/src
/third_party/libmtp/
/third_party/libphonenumber/libphonenumber.xml
/third_party/libphonenumber/libphonenumber_without_metadata.xml
@@ -296,6 +303,7 @@
/third_party/webrtc/modules/video_coding/codecs/vp8_internal
/third_party/widevine/cdm/binaries
/third_party/widevine/cdm/symbols
+/third_party/win_toolchain/files
/third_party/wix
/third_party/xdg-utils
/third_party/xulrunner-sdk
@@ -312,6 +320,7 @@
/tools/gyp
/tools/histograms
/tools/json_schema_compiler/test/json_schema_compiler_tests.xml
+/tools/metrics/histograms/histograms.before.pretty-print.xml
/tools/page_cycler/acid3
/tools/perf/data
/tools/perf/results.html