Pass license check script for most of the tree.

Modified license-checker script to allow pruning directories
we know to be ok.

Still need to do a bit of third_party/* , as well as
file a bunch of bugs on pieces where the licenses aren't clear,
but I'm running out of energy.

Review URL: http://codereview.chromium.org/1100003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42045 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 362 insertions, 87 deletions

diff --git a/chrome/third_party/jstemplate/README.chromium b/chrome/third_party/jstemplate/README.chromium
index 51e0db5..153d6a6 100644
--- a/chrome/third_party/jstemplate/README.chromium
+++ b/chrome/third_party/jstemplate/README.chromium
@@ -1,11 +1,12 @@
+Name: google-jstemplate
+URL: http://code.google.com/p/google-jstemplate/
+
 "Template processing that is more suitable for the specific development-time
 and runtime requirements of AJAX based web applications.
 
 Specifically, support the case to update a previous template processing
 output with an incremental change to the original input data."
 
-This is a branch of http://code.google.com/p/google-jstemplate/
-
 Uncalled functions have been removed from util.js to make the resulting
 javascript smaller.
 
diff --git a/chrome/third_party/mozilla_security_manager/LICENSE b/chrome/third_party/mozilla_security_manager/LICENSE
new file mode 100644
index 0000000..cbb1827
--- /dev/null
+++ b/chrome/third_party/mozilla_security_manager/LICENSE
@@ -0,0 +1,35 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
diff --git a/chrome/third_party/mozilla_security_manager/README.chromium b/chrome/third_party/mozilla_security_manager/README.chromium
index 18bb62b..6a1a3d0 100644
--- a/chrome/third_party/mozilla_security_manager/README.chromium
+++ b/chrome/third_party/mozilla_security_manager/README.chromium
@@ -1,7 +1,7 @@
+Name: Mozilla Personal Security Manager
 URL: http://mxr.mozilla.org/mozilla-central/source/security/manager/
 InfoURL: http://www.mozilla.org/
 Version: 36838:a59a5f030021
-License: MPL 1.1/GPL 2.0/LGPL 2.1
 
 Description:
 This is selected code bits from Mozilla's Personal Security Manager.
diff --git a/net/third_party/nss/LICENSE b/net/third_party/nss/LICENSE
new file mode 100644
index 0000000..0367164
--- /dev/null
+++ b/net/third_party/nss/LICENSE
@@ -0,0 +1,35 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
diff --git a/net/third_party/nss/README.chromium b/net/third_party/nss/README.chromium
index 332b778..918d225 100644
--- a/net/third_party/nss/README.chromium
+++ b/net/third_party/nss/README.chromium
@@ -1,3 +1,6 @@
+Name: Network Security Services (NSS)
+URL: http://www.mozilla.org/projects/security/pki/nss/
+
 This directory includes a copy of NSS's libssl from the CVS repo at:
   :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
diff --git a/third_party/apple/README.chromium b/third_party/apple/README.chromium
index d0a78bf9..fb30109 100644
--- a/third_party/apple/README.chromium
+++ b/third_party/apple/README.chromium
@@ -1,6 +1,5 @@
-This is Chromium's local copy of Apple sample code,
-originally obtained from http://developer.apple.com/.
-See the block comment in each file for license information.
+Name: Apple sample code
+URL: http://developer.apple.com/
 
 Local changes:
 * ImageAndTextCell.h: Changed 'image' property to 'retain' mode to fix a crash.
diff --git a/third_party/bsdiff/README.chromium b/third_party/bsdiff/README.chromium
index 54e9998..aa4b305b 100644
--- a/third_party/bsdiff/README.chromium
+++ b/third_party/bsdiff/README.chromium
@@ -1,9 +1,10 @@
+Name: bsdiff
+URL: http://lxr.mozilla.org/mozilla/source/other-licenses/bsdiff/bsdiff.c
+
 This is Chrome's locally patched copy of Colin Percival's bsdiff tool
 (see ../bspatch for the corresponding bspatch tool).
 
-Originally obtained from Mozilla's local copy/fork of bsdiff; see:
-
-http://lxr.mozilla.org/mozilla/source/other-licenses/bsdiff/bsdiff.c
+Originally obtained from Mozilla's local copy/fork of bsdiff; see URL.
 
 The LICENSE from that location has been preserved here.
 
diff --git a/third_party/bspatch/LICENSE b/third_party/bspatch/LICENSE
index b741c73..c146b5b 100644
--- a/third_party/bspatch/LICENSE
+++ b/third_party/bspatch/LICENSE
@@ -1 +1,121 @@
-See ../bsdiff/LICENSE.
+BSD Protection License
+February 2002
+
+Preamble
+--------
+
+The Berkeley Software Distribution ("BSD") license has proven very effective
+over the years at allowing for a wide spread of work throughout both
+commercial and non-commercial products.  For programmers whose primary
+intention is to improve the general quality of available software, it is
+arguable that there is no better license than the BSD license, as it
+permits improvements to be used wherever they will help, without idealogical
+or metallic constraint.
+
+This is of particular value to those who produce reference implementations
+of proposed standards: The case of TCP/IP clearly illustrates that freely
+and universally available implementations leads the rapid acceptance of
+standards -- often even being used instead of a de jure standard (eg, OSI
+network models).
+
+With the rapid proliferation of software licensed under the GNU General
+Public License, however, the continued success of this role is called into
+question.  Given that the inclusion of a few lines of "GPL-tainted" work
+into a larger body of work will result in restricted distribution -- and
+given that further work will likely build upon the "tainted" portions,
+making them difficult to remove at a future date -- there are inevitable
+circumstances where authors would, in order to protect their goal of
+providing for the widespread usage of their work, wish to guard against
+such "GPL-taint".
+
+In addition, one can imagine that companies which operate by producing and
+selling (possibly closed-source) code would wish to protect themselves
+against the rise of a GPL-licensed competitor.  While under existing
+licenses this would mean not releasing their code under any form of open
+license, if a license existed under which they could incorporate any
+improvements back into their own (commercial) products then they might be
+far more willing to provide for non-closed distribution.
+
+For the above reasons, we put forth this "BSD Protection License": A
+license designed to retain the freedom granted by the BSD license to use
+licensed works in a wide variety of settings, both non-commercial and
+commercial, while protecting the work from having future contributors
+restrict that freedom.
+
+The precise terms and conditions for copying, distribution, and
+modification follow.
+
+BSD PROTECTION LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION
+----------------------------------------------------------------
+
+0. Definitions.
+   a) "Program", below, refers to any program or work distributed under
+      the terms of this license.
+   b) A "work based on the Program", below, refers to either the Program
+      or any derivative work under copyright law.
+   c) "Modification", below, refers to the act of creating derivative works.
+   d) "You", below, refers to each licensee.
+
+1. Scope.
+   This license governs the copying, distribution, and modification of the
+   Program.  Other activities are outside the scope of this license; The
+   act of running the Program is not restricted, and the output from the
+   Program is covered only if its contents constitute a work based on the
+   Program.
+
+2. Verbatim copies.
+   You may copy and distribute verbatim copies of the Program as you
+   receive it, in any medium, provided that you conspicuously and
+   appropriately publish on each copy an appropriate copyright notice; keep
+   intact all the notices that refer to this License and to the absence of
+   any warranty; and give any other recipients of the Program a copy of this
+   License along with the Program.
+
+3. Modification and redistribution under closed license.
+   You may modify your copy or copies of the Program, and distribute
+   the resulting derivative works, provided that you meet the
+   following conditions:
+   a) The copyright notice and disclaimer on the Program must be reproduced
+      and included in the source code, documentation, and/or other materials
+      provided in a manner in which such notices are normally distributed.
+   b) The derivative work must be clearly identified as such, in order that
+      it may not be confused with the original work.
+   c) The license under which the derivative work is distributed must
+      expressly prohibit the distribution of further derivative works.
+
+4. Modification and redistribution under open license.
+   You may modify your copy or copies of the Program, and distribute
+   the resulting derivative works, provided that you meet the
+   following conditions:
+   a) The copyright notice and disclaimer on the Program must be reproduced
+      and included in the source code, documentation, and/or other materials
+      provided in a manner in which such notices are normally distributed.
+   b) You must clearly indicate the nature and date of any changes made
+      to the Program.  The full details need not necessarily be included in
+      the individual modified files, provided that each modified file is
+      clearly marked as such and instructions are included on where the
+      full details of the modifications may be found.
+   c) You must cause any work that you distribute or publish, that in whole
+      or in part contains or is derived from the Program or any part
+      thereof, to be licensed as a whole at no charge to all third
+      parties under the terms of this License.
+
+5. Implied acceptance.
+   You may not copy or distribute the Program or any derivative works except
+   as expressly provided under this license.  Consequently, any such action
+   will be taken as implied acceptance of the terms of this license.
+
+6. NO WARRANTY.
+   THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+   THE COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING, BUT
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+   TORT, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGES.
diff --git a/third_party/bspatch/README.chromium b/third_party/bspatch/README.chromium
index 3c6f8685..59e0788 100644
--- a/third_party/bspatch/README.chromium
+++ b/third_party/bspatch/README.chromium
@@ -1,13 +1,14 @@
+Name: bspatch
+URL: http://lxr.mozilla.org/mozilla/source/toolkit/mozapps/update/src/updater/
+
 This is Chrome's locally patched copy of Colin Percival's bspatch tool
 (see ../bsdiff for the corresponding bsdiff tool).
 
 Originally obtained from Mozilla's local copy/fork of bspatch; see:
 
-http://lxr.mozilla.org/mozilla/source/toolkit/mozapps/update/src/updater/
-
 The license is shared in common with bsdiff.
 
 Local changes include CRC32 verification.
 
 Update(08 Sep 08): Changed ApplyBinaryPatch to accept wchar_t paths
-instead of char paths.
\ No newline at end of file
+instead of char paths.
diff --git a/third_party/bzip2/README.chromium b/third_party/bzip2/README.chromium
index b9c8c08..75d1b5c 100644
--- a/third_party/bzip2/README.chromium
+++ b/third_party/bzip2/README.chromium
@@ -1,8 +1,8 @@
+Name: bzip2
+URL: http://www.bzip.org/downloads.html
+
 This is a copy of the parts of the bzip-1.0.5 distribution needed to build
 the bzip2 library.
 
-The current distribution is available from:
-http://www.bzip.org/downloads.html
-
 When updating, no modifications should be necessary aside from copying
 the subset of files included here.
diff --git a/third_party/codesighs/README.chromium b/third_party/codesighs/README.chromium
index 36d4079..58f6e83 100644
--- a/third_party/codesighs/README.chromium
+++ b/third_party/codesighs/README.chromium
@@ -1,9 +1,10 @@
+Name: codesighs
+URL: http://hg.mozilla.org/mozilla-central/tools/codesighs
+
 This is Chromium's copy of the Mozilla codesighs tool.
 
 Originally obtained from Mozilla's Mercurial repository
-on 17 April 2009:
-
-http://hg.mozilla.org/mozilla-central/tools/codesighs
+on 17 April 2009.
 
 The LICENSE from http://hg.mozilla.org/mozilla-central has been copied
 here.
diff --git a/third_party/expat/README.chromium b/third_party/expat/README.chromium
index 95a97e8..fc24570 100644
--- a/third_party/expat/README.chromium
+++ b/third_party/expat/README.chromium
@@ -1,7 +1,8 @@
+Name: expat
 URL: http://sourceforge.net/projects/expat/
 Version: 2.7.0
 License: MIT
-License File: COPYING
+License File: files/COPYING
 
 Description:
   This is Expat XML parser - very lightweight C library for parsing XML.
diff --git a/third_party/ffmpeg/README.chromium b/third_party/ffmpeg/README.chromium
index 1aedd78..7adef04 100644
--- a/third_party/ffmpeg/README.chromium
+++ b/third_party/ffmpeg/README.chromium
@@ -1,3 +1,7 @@
+Name: ffmpeg
+URL: http://ffmpeg.org/
+License File: source/patched-ffmpeg-mt/LICENSE
+
 This file describes how to produce the FFmpeg include directory, and how to
 create the ffmpeg.gyp file and related configurations.
 
diff --git a/third_party/harfbuzz/README.google b/third_party/harfbuzz/README.chromium
index 74eeb2e..8dbcd34 100644
--- a/third_party/harfbuzz/README.google
+++ b/third_party/harfbuzz/README.chromium
@@ -1,6 +1,5 @@
-Harfbuzz
-
-http://freedesktop.org/wiki/Software/HarfBuzz
+Name: Harfbuzz
+URL: http://freedesktop.org/wiki/Software/HarfBuzz
 
 This code was taken from b0d396aa88b3cdf8cea896bfeeba197656e1cdb1
 (git://anongit.freedesktop.org/harfbuzz)
diff --git a/third_party/jemalloc/README.chromium b/third_party/jemalloc/README.chromium
index 0c587cb..c277896 100644
--- a/third_party/jemalloc/README.chromium
+++ b/third_party/jemalloc/README.chromium
@@ -1,38 +1,41 @@
-This contains Chromium's locally patched copy of Jason Evans' jemalloc package.

-

-License terms are contained in the source files themselves.

-

-Contents:

-

-    README.chromium

-

-        This file you're looking at right now.

-

-    chromium/

-

-        The chromium patched sources, copied from the vendor/

-        subdirectory and containing our local modifications.

-

-    vendor/

-

-        Vanilla sources from Mozilla's copy at:

-

-            http://hg.mozilla.org/mozilla-central/src/memory

-

-        The current revision is:

-

-            changeset:   31465:63c44f8d16ac

-            parent:      31462:70b3b23c948a

-            user:        Robert Sayre <sayrer@gmail.com>

-            date:        Thu Aug 06 11:16:20 2009 -0700

-            summary:     Backed out changeset 70b3b23c948a

-

-HOWTOs:

-

-    Take a new version from upstream:

-

-        TODO(sgk)

-

-    Merge a new upstream version with our local patched copy:

-

-        TODO(sgk)

+Name: jemalloc
+URL: http://hg.mozilla.org/mozilla-central/src/memory
+
+This contains Chromium's locally patched copy of Jason Evans' jemalloc package.
+
+License terms are contained in the source files themselves.
+
+Contents:
+
+    README.chromium
+
+        This file you're looking at right now.
+
+    chromium/
+
+        The chromium patched sources, copied from the vendor/
+        subdirectory and containing our local modifications.
+
+    vendor/
+
+        Vanilla sources from Mozilla's copy at:
+
+            http://hg.mozilla.org/mozilla-central/src/memory
+
+        The current revision is:
+
+            changeset:   31465:63c44f8d16ac
+            parent:      31462:70b3b23c948a
+            user:        Robert Sayre <sayrer@gmail.com>
+            date:        Thu Aug 06 11:16:20 2009 -0700
+            summary:     Backed out changeset 70b3b23c948a
+
+HOWTOs:
+
+    Take a new version from upstream:
+
+        TODO(sgk)
+
+    Merge a new upstream version with our local patched copy:
+
+        TODO(sgk)
diff --git a/third_party/lcov/README.chromium b/third_party/lcov/README.chromium
index 12a1b60..7177fee 100644
--- a/third_party/lcov/README.chromium
+++ b/third_party/lcov/README.chromium
@@ -1,6 +1,7 @@
-This directory contains a stock lcov-1.7 available from
-http://ltp.sourceforge.net/coverage/lcov.php with the following
-changes:
+Name: lcov
+URL: http://ltp.sourceforge.net/coverage/lcov.php
+
+This directory contains a stock lcov-1.7 with the following changes:
 
 - Added bin/mcov, an assembly script derived from lcov which is
  particularly useful for dealing with Mac XCode build paths.
diff --git a/third_party/libevent/LICENSE b/third_party/libevent/LICENSE
new file mode 100644
index 0000000..af977a4
--- /dev/null
+++ b/third_party/libevent/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+Copyright 2007-2009 Niels Provos and Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/libevent/README.chromium b/third_party/libevent/README.chromium
index 04f1b22..1cd6437 100644
--- a/third_party/libevent/README.chromium
+++ b/third_party/libevent/README.chromium
@@ -1,5 +1,5 @@
+Name: libevent
 URL: http://www.monkey.org/~provos/libevent/
-     http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
 Version: 1.4.13
 License: BSD
 
diff --git a/third_party/libjpeg/README.chromium b/third_party/libjpeg/README.chromium
index 809abe7..bb19b33 100644
--- a/third_party/libjpeg/README.chromium
+++ b/third_party/libjpeg/README.chromium
@@ -1,3 +1,6 @@
+Name: libjpeg
+URL: http://www.ijg.org/
+
 This contains a copy of libjpeg-6b.
 
 The project files does not incldue from the distribution:
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium
index 659e650..93312ff 100644
--- a/third_party/libxml/README.chromium
+++ b/third_party/libxml/README.chromium
@@ -1,5 +1,8 @@
-This directory contains a partial snapshot of the libxml library from
-http://xmlsoft.org, with the patch in google.patch applied. google.patch
+Name: libxml
+URL: http://xmlsoft.org
+
+This directory contains a partial snapshot of the libxml library
+with the patch in google.patch applied. google.patch
 includes the following modifications : 
 * Modified encoding.c to fix memory leak (06/13/2008)
 * Modified win32/configure.js NOT to use iconv
diff --git a/third_party/libxslt/README.chromium b/third_party/libxslt/README.chromium
index 436d1d8..be4e44e 100644
--- a/third_party/libxslt/README.chromium
+++ b/third_party/libxslt/README.chromium
@@ -1,5 +1,8 @@
-This directory contains a partial snapshot of the libxslt library from
-http://xmlsoft.org/XSLT, with the following modification:
+Name: libxslt
+URL: http://xmlsoft.org/XSLT
+
+This directory contains a partial snapshot of the libxslt library
+with the following modification:
 
 1) Modified win32/configure.js to be able to clobber a read-only Makefile
 This consists of:
diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium
index 2731cf3..170cb76 100644
--- a/third_party/ocmock/README.chromium
+++ b/third_party/ocmock/README.chromium
@@ -1,8 +1,8 @@
+Name: OCMock
 URL: http://www.mulle-kybernetik.com/software/OCMock/
-     http://svn.mulle-kybernetik.com/OCMock/trunk/Source/@55
 Version: r55
 License: BSD with advertising clause
-License File: License.txt
+License File: OCMock/License.txt
 
 Description:
 OCMock is an Objective-C implementation of mock objects. If you are unfamiliar
diff --git a/third_party/simplejson/README.google b/third_party/simplejson/README.chromium
index 7f726ce..10770eb 100644
--- a/third_party/simplejson/README.google
+++ b/third_party/simplejson/README.chromium
@@ -1,3 +1,4 @@
+Name: simplejson
 URL: http://undefined.org/python/#simplejson
 Version: 1.7.3
 License: MIT
diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium
index 5d7a0970..aa35c1f 100644
--- a/third_party/zlib/README.chromium
+++ b/third_party/zlib/README.chromium
@@ -1,7 +1,7 @@
-URL:  http://zlib.net/
+Name: zlib
+URL: http://zlib.net/
 Version: 1.2.3
 License: zlib
-License File: LICENSE
 
 Description:
 General purpose compression library
@@ -10,4 +10,4 @@ Local Modifications:
 A few minor changes, all marked with "Google":
 - Added #ifdefs to avoid compile warnings when NO_GZCOMPRESS is defined.
 - Removed use of strerror for WinCE in gzio.c.
-- Added 'int z_errno' global for WinCE, to which 'errno' is defined in zutil.h.
\ No newline at end of file
+- Added 'int z_errno' global for WinCE, to which 'errno' is defined in zutil.h.
diff --git a/tools/licenses.py b/tools/licenses.py
index 1b935c9..cb4ccfb 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -10,6 +10,27 @@ directories.
 
 import os
 
+# Paths from the root of the tree to directories to skip.
+PRUNE_PATHS = set([
+    # This is just a tiny vsprops file, presumably written by the googleurl
+    # authors.  Not third-party code.
+    "googleurl/third_party/icu",
+
+    # We don't bundle o3d samples into our resulting binaries.
+    "o3d/samples",
+
+    # Written as part of Chromium.
+    "third_party/fuzzymatch",
+
+    # Two directories that are the same as those in base/third_party.
+    "v8/src/third_party/dtoa",
+    "v8/src/third_party/valgrind",
+])
+
+# Directories we don't scan through.
+PRUNE_DIRS = ('.svn', '.git',             # VCS metadata
+              'out', 'Debug', 'Release',  # build files
+              'layout_tests')             # lots of subdirs
 
 class LicenseError(Exception):
     """We raise this exception when a directory's licensing info isn't
@@ -26,7 +47,7 @@ def ParseDir(path):
         raise LicenseError("missing README.chromium")
 
     # Parse metadata fields out of README.chromium.
-    # We provide a default value of "LICENSE" for the license file.
+    # We examine "LICENSE" for the license file by default.
     metadata = {
         "License File": "LICENSE",  # Relative path to license text.
         "Name": None,               # Short name (for header on about:credits).
@@ -34,6 +55,8 @@ def ParseDir(path):
         }
     for line in open(readme_path):
         line = line.strip()
+        if not line:
+            break
         for key in metadata.keys():
             field = key + ": "
             if line.startswith(field):
@@ -46,12 +69,19 @@ def ParseDir(path):
                                "in README.chromium")
 
     # Check that the license file exists.
-    license_file = metadata["License File"]
-    license_path = os.path.join(path, license_file)
-    if not os.path.exists(license_path):
-        raise LicenseError("License file '" + license_file + "' doesn't exist. "
-                           "Either add a 'License File:' section to "
-                           "README.chromium or add the missing file.")
+    for filename in (metadata["License File"], "COPYING"):
+        license_path = os.path.join(path, filename)
+        if os.path.exists(license_path):
+            metadata["License File"] = filename
+            break
+        license_path = None
+
+    if not license_path:
+        raise LicenseError("License file not found. "
+                           "Either add a file named LICENSE, "
+                           "import upstream's COPYING if available, "
+                           "or add a 'License File:' line to README.chromium "
+                           "with the appropriate path.")
 
     return metadata
 
@@ -73,21 +103,28 @@ def ScanThirdPartyDirs(third_party_dirs):
 
 def FindThirdPartyDirs():
     """Find all third_party directories underneath the current directory."""
-    skip_dirs = ('.svn', '.git',             # VCS metadata
-                 'out', 'Debug', 'Release',  # build files
-                 'layout_tests')             # lots of subdirs
-
     third_party_dirs = []
     for path, dirs, files in os.walk('.'):
         path = path[len('./'):]  # Pretty up the path.
 
+        if path in PRUNE_PATHS:
+            dirs[:] = []
+            continue
+
         # Prune out directories we want to skip.
-        for skip in skip_dirs:
+        # (Note that we loop over PRUNE_DIRS so we're not iterating over a
+        # list that we're simultaneously mutating.)
+        for skip in PRUNE_DIRS:
             if skip in dirs:
                 dirs.remove(skip)
 
         if os.path.basename(path) == 'third_party':
-            third_party_dirs.extend([os.path.join(path, dir) for dir in dirs])
+            # Add all subdirectories that are not marked for skipping.
+            for dir in dirs:
+                dirpath = os.path.join(path, dir)
+                if dirpath not in PRUNE_PATHS:
+                    third_party_dirs.append(dirpath)
+
             # Don't recurse into any subdirs from here.
             dirs[:] = []
             continue