summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 01:59:37 +0000
committerghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 01:59:37 +0000
commitf914258c25bd8e68d61f59e9953663ac71d97339 (patch)
treec2f123c0d790144a738be785c1e14f66217948e1
parent1efb61d2ab2931e7e69bba1de91d666e7633c89a (diff)
downloadchromium_src-f914258c25bd8e68d61f59e9953663ac71d97339.zip
chromium_src-f914258c25bd8e68d61f59e9953663ac71d97339.tar.gz
chromium_src-f914258c25bd8e68d61f59e9953663ac71d97339.tar.bz2
Rolls cacheinvalidation forward to @143. (The only C++ changes are the license fixes.)
Review URL: http://codereview.chromium.org/8037054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103074 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h7
-rwxr-xr-xtools/checklicenses/checklicenses.py3
3 files changed, 5 insertions, 7 deletions
diff --git a/DEPS b/DEPS
index 3615e77..c7ea3c0 100644
--- a/DEPS
+++ b/DEPS
@@ -86,7 +86,7 @@ deps = {
"src/third_party/cacheinvalidation/files/src/google":
(Var("googlecode_url") % "google-cache-invalidation-api") +
- "/trunk/src/google@135",
+ "/trunk/src/google@143",
"src/third_party/leveldatabase/src":
(Var("googlecode_url") % "leveldb") + "/trunk@51",
diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h
index 62dee55..8e15595 100644
--- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h
+++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h
@@ -1,6 +1,7 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-// Author: ghc@google.com (Greg Cooper)
-//
+// Copyright (c) 2011 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.
+
// Interface to SHA1 digest computation.
#ifndef GOOGLE_CACHEINVALIDATION_V2_SHA1_DIGEST_FUNCTION_H_
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index ddd6805..e850058 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -200,9 +200,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'third_party/bzip2': [
'UNKNOWN',
],
- 'third_party/cacheinvalidation': [
- 'UNKNOWN',
- ],
'third_party/cld/encodings/compact_lang_det': [
'UNKNOWN',
],