Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / tools / third_party_files_whitelist.txt

diff --git a/src/android_webview/tools/third_party_files_whitelist.txt b/src/android_webview/tools/third_party_files_whitelist.txt
index 986467f..8c88957 100644 (file)
--- a/src/android_webview/tools/third_party_files_whitelist.txt
+++ b/src/android_webview/tools/third_party_files_whitelist.txt
@@ -9,6 +9,8 @@
 # so additions to this file should be rare. See
 # http://www.chromium.org/developers/adding-3rd-party-libraries.
 
+# Contains test strings that look like copyrights.
+android_webview/tools/copyright_scanner_unittest.py
 # Copyright IBM; MIT license. This third-party code is taken from ICU, the
 # license for which we already pick up from third_party/icu/.
 base/i18n/icu_string_conversions.cc
@@ -67,13 +69,18 @@ content/renderer/history_entry.h
 # Copyright Apple Inc, Nokia Corporation and Torch Mobile Inc; BSD license.
 # Moved from third_party/WebKit/.
 content/renderer/history_entry.cc
+# Copyright Apple Inc; BSD license. Moved from third_party/WebKit/.
+content/renderer/input/input_scroll_elasticity_controller.cc
+content/renderer/input/input_scroll_elasticity_controller.h
 # Copyright Google Inc, no license. Not used on Android.
 google_update/google_update_idl.idl
 # Native client not used in Android. Contains the word "Copyright"
 native_client_sdk/doc_generated/rest-devsite-examples.html
 # String '(c)' used in certificates organization names
-net/quic/crypto/common_cert_set_1_50.inc
-net/quic/crypto/common_cert_set_51_100.inc
+net/quic/crypto/common_cert_set_0a.inc
+net/quic/crypto/common_cert_set_0b.inc
+net/quic/crypto/common_cert_set_1a.inc
+net/quic/crypto/common_cert_set_1b.inc
 # String '(c)' used in certificates organization names
 net/test/test_certificate_data.h
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD