summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 20:08:12 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 20:08:12 +0000
commit96a4c3ebbb1261722172422cd4eba65dd7e05765 (patch)
tree680d4898f61bbbf2d0c6c0455a5a37a3d43d3235
parentb55b9b12a1f8d4e41ab42bfed68777c1f3213afc (diff)
downloadchromium_src-96a4c3ebbb1261722172422cd4eba65dd7e05765.zip
chromium_src-96a4c3ebbb1261722172422cd4eba65dd7e05765.tar.gz
chromium_src-96a4c3ebbb1261722172422cd4eba65dd7e05765.tar.bz2
Rolled cacheinvalidation to @67.
This includes a crash fix (see bugs). BUG=65945,chromium-os:5014 TEST=Manual Review URL: http://codereview.chromium.org/5782001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68881 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/cacheinvalidation/cacheinvalidation.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 9f761cd..c4c41ad 100644
--- a/DEPS
+++ b/DEPS
@@ -52,7 +52,7 @@ deps = {
(Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106",
"src/third_party/cacheinvalidation/files":
- (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@61",
+ (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@67",
"src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@857",
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index cc3e476..0f26cd3 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -140,6 +140,7 @@
'../../base/test/run_all_unittests.cc',
'files/src/google/cacheinvalidation/system-resources-for-test.h',
'files/src/google/cacheinvalidation/invalidation-client-impl_test.cc',
+ 'files/src/google/cacheinvalidation/persistence-manager_test.cc',
'files/src/google/cacheinvalidation/persistence-utils_test.cc',
'files/src/google/cacheinvalidation/throttle_test.cc',
],