Land Recent QUIC changes

android_webview/tools/third_party_files_whitelist.txt

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file records third-party licensing information for the purposes of the
 # Android WebView build. See webview_licenses.py for details.
 #
 # New third-party code should be added under a directory named 'third_party',
 # so additions to this file should be rare. See
 # http://www.chromium.org/developers/adding-3rd-party-libraries.
@@ skipping 68 matching lines @@
 content/browser/geolocation/osx_wifi.h
 # Copyright The Chromium Authors, Apple Inc and Graham Dennis; BSD license. Not
 # used on Android.
 content/browser/renderer_host/render_widget_host_view_mac.mm
 # Copyright The Chromium Authors and Google Inc; BSD license. Not used on
 # Android.
 content/browser/renderer_host/web_input_event_aurax11.cc
 # Copyright Google Inc, no license. Not used on Android.
 google_update/google_update_idl.idl
 # 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
+# String '(c)' used in certificates organization names
 net/test/test_certificate_data.h
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD
 # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
 # Mozilla, the license for which we already pick up from third_party/npapi/.
 net/cookies/cookie_monster.cc
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD
 # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
 # Mozilla, the license for which we already pick up from third_party/npapi/.
 net/cookies/canonical_cookie.cc
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD
@@ skipping 123 matching lines @@
 # Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on
 # Android.
 webkit/glue/webcursor_gtk_data.h
 # This third-party code is taken from Mozilla, but is copyright Google and has
 # been re-licensed under the Chromium license.
 webkit/support/webkit_support_gfx.cc
 # Copyright Apple, Inc, Graham Dennis and Eric Seidel; BSD license. Tool only
 webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h
 # Copyright Apple, Inc, Graham Dennis and Eric Seidel; BSD license. Tool only
 webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m