diff options
| author | ghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 12:45:39 +0000 |
|---|---|---|
| committer | ghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 12:45:39 +0000 |
| commit | 5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef (patch) | |
| tree | 647727ed83f3672e46fb983154f308f96a0b3bad | |
| parent | a4365670b6bc6ae5dd9b47051f9aeca6e659e540 (diff) | |
| download | chromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.zip chromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.tar.gz chromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.tar.bz2 | |
Roll cacheinvalidation forward to @261.
Changes there are mostly refactorings, with some minor changes
around when the client sends presence heartbeats after coming
online.
Review URL: https://chromiumcodereview.appspot.com/11993005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177657 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | sync/notifier/push_client_channel_unittest.cc | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h | 9 |
4 files changed, 12 insertions, 3 deletions
@@ -91,7 +91,7 @@ deps = { "src/third_party/cacheinvalidation/src": (Var("googlecode_url") % "google-cache-invalidation-api") + - "/trunk/src@247", + "/trunk/src@261", "src/third_party/leveldatabase/src": (Var("googlecode_url") % "leveldb") + "/trunk@71", diff --git a/sync/notifier/push_client_channel_unittest.cc b/sync/notifier/push_client_channel_unittest.cc index 4ac0c58..ffe90e7 100644 --- a/sync/notifier/push_client_channel_unittest.cc +++ b/sync/notifier/push_client_channel_unittest.cc @@ -33,7 +33,7 @@ class PushClientChannelTest : public ::testing::Test { virtual ~PushClientChannelTest() {} - void OnIncomingMessage(const std::string& incoming_message) { + void OnIncomingMessage(std::string incoming_message) { last_message_ = incoming_message; } diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 0ccfd14..d783dcb 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -67,6 +67,8 @@ 'src/google/cacheinvalidation/impl/digest-store.h', 'src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.cc', 'src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.h', + 'src/google/cacheinvalidation/impl/invalidation-client-core.cc', + 'src/google/cacheinvalidation/impl/invalidation-client-core.h', 'src/google/cacheinvalidation/impl/invalidation-client-factory.cc', 'src/google/cacheinvalidation/impl/invalidation-client-impl.cc', 'src/google/cacheinvalidation/impl/invalidation-client-impl.h', diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h index c5dd13f..80e894a 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h @@ -10,9 +10,16 @@ namespace invalidation { -using base::IntToString; using base::StringAppendV; +inline std::string SimpleItoa(int v) { + return base::IntToString(v); +} + +inline std::string SimpleItoa(int64 v) { + return base::Int64ToString(v); +} + } // namespace invalidation #endif // GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ |