diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/registration_manager_unittest.cc | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 1 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/random.h | 25 |
4 files changed, 28 insertions, 2 deletions
@@ -46,7 +46,7 @@ deps = { "http://protobuf.googlecode.com/svn/trunk@327", "src/third_party/cacheinvalidation/files": - "http://google-cache-invalidation-api.googlecode.com/svn/trunk@21", + "http://google-cache-invalidation-api.googlecode.com/svn/trunk@30", "src/tools/gyp": "http://gyp.googlecode.com/svn/trunk@826", diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/chrome/browser/sync/notifier/registration_manager_unittest.cc index 0f47f88..6d73afa 100644 --- a/chrome/browser/sync/notifier/registration_manager_unittest.cc +++ b/chrome/browser/sync/notifier/registration_manager_unittest.cc @@ -153,7 +153,7 @@ TEST_F(RegistrationManagerTest, RegisterType) { results[2].mutable_operation()->mutable_object_id()-> mutable_name()->set_string_value("garbage"); results[3].mutable_status()-> - set_code(invalidation::Status::UNKNOWN_ERROR); + set_code(invalidation::Status::PERMANENT_FAILURE); *results[4].mutable_operation()->mutable_object_id() = ModelTypeToObjectId(syncable::TYPED_URLS); diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 5e9347a..ef54f66 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -70,6 +70,7 @@ 'overrides/google/cacheinvalidation/googletest.h', 'overrides/google/cacheinvalidation/logging.h', 'overrides/google/cacheinvalidation/mutex.h', + 'overrides/google/cacheinvalidation/random.h', 'overrides/google/cacheinvalidation/stl-namespace.h' 'overrides/google/cacheinvalidation/string_util.h' 'overrides/google/cacheinvalidation/time.h', diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/random.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/random.h new file mode 100644 index 0000000..89455f6 --- /dev/null +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/random.h @@ -0,0 +1,25 @@ +// Copyright (c) 2010 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. + +#ifndef GOOGLE_CACHEINVALIDATION_RANDOM_H_ +#define GOOGLE_CACHEINVALIDATION_RANDOM_H_ + +#include "base/rand_util.h" + +namespace invalidation { + +class Random { + public: + // We don't actually use the seed. + explicit Random(int64 seed) {} + + // Returns a pseudorandom value between(inclusive) and(exclusive). + double RandDouble() { + return base::RandDouble(); + } +}; + +} // namespace invalidation + +#endif // GOOGLE_CACHEINVALIDATION_RANDOM_H_ |