summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 20:14:01 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 20:14:01 +0000
commit049568b450d8f6da4bce3bafaf142436ca5b4a56 (patch)
tree3f29a74eda3022fa7876b4524b6efd9243373618
parent7f65131b89a9636a566b3b3280beab05a05c6699 (diff)
downloadchromium_src-049568b450d8f6da4bce3bafaf142436ca5b4a56.zip
chromium_src-049568b450d8f6da4bce3bafaf142436ca5b4a56.tar.gz
chromium_src-049568b450d8f6da4bce3bafaf142436ca5b4a56.tar.bz2
[Sync] Roll google-cache-invalidation to @78
This removes the explicit dependency on base/scoped_ptr.h. Also set chromium_code=1, as all compile warnings/errors with that setting have been fixed. BUG=77804 TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80431 Review URL: http://codereview.chromium.org/6794042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80517 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/cacheinvalidation/cacheinvalidation.gyp3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 09bcdfa..c83f0d3 100644
--- a/DEPS
+++ b/DEPS
@@ -61,7 +61,7 @@ deps = {
(Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106",
"src/third_party/cacheinvalidation/files":
- (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@70",
+ (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@78",
"src/third_party/leveldb":
(Var("googlecode_url") % "leveldb") + "/trunk@19",
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 8bff843..fc31de9 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -7,6 +7,9 @@
{
'variables': {
+ # This library should build cleanly with the extra warnings turned on
+ # for Chromium.
+ 'chromium_code': 1,
# The root directory for the proto files.
'proto_dir_root': 'files/src',
# The relative path of the cacheinvalidation proto files from