Roll cacheinvalidation forward to @200. Summary of changes:

- Restructure source directory into deps/, impl/, include/, test/.
- Fix a bug where redundant registrations would be resent.
- Fix a bug that would prevent retry delays from being computed correctly.
- Some cosmetic code cleanup.

Review URL: http://codereview.chromium.org/9675001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126353 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 68 insertions, 69 deletions

diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index eff4515..8e47824 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -102,66 +102,64 @@
       'target_name': 'cacheinvalidation',
       'type': 'static_library',
       'sources': [
-        'overrides/google/cacheinvalidation/v2/callback.h',
-        'overrides/google/cacheinvalidation/v2/gmock.h',
-        'overrides/google/cacheinvalidation/v2/googletest.h',
-        'overrides/google/cacheinvalidation/v2/logging.h',
-        'overrides/google/cacheinvalidation/v2/mutex.h',
-        'overrides/google/cacheinvalidation/v2/random.h',
-        'overrides/google/cacheinvalidation/v2/scoped_ptr.h',
-        'overrides/google/cacheinvalidation/v2/stl-namespace.h',
-        'overrides/google/cacheinvalidation/v2/string_util.h',
-        'overrides/google/cacheinvalidation/v2/time.h',
-        'files/src/google/cacheinvalidation/v2/basic-system-resources.cc',
-        'files/src/google/cacheinvalidation/v2/basic-system-resources.h',
-        'files/src/google/cacheinvalidation/v2/checking-invalidation-listener.cc',
-        'files/src/google/cacheinvalidation/v2/checking-invalidation-listener.h',
-        'files/src/google/cacheinvalidation/v2/client-protocol-namespace-fix.h',
-        'files/src/google/cacheinvalidation/v2/constants.cc',
-        'files/src/google/cacheinvalidation/v2/constants.h',
-        'files/src/google/cacheinvalidation/v2/digest-function.h',
-        'files/src/google/cacheinvalidation/v2/digest-store.h',
-        'files/src/google/cacheinvalidation/v2/exponential-backoff-delay-generator.cc',
-        'files/src/google/cacheinvalidation/v2/exponential-backoff-delay-generator.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-factory.cc',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-factory.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-impl.cc',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-impl.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-client.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-util.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-listener.h',
-        'files/src/google/cacheinvalidation/v2/log-macro.h',
-        'files/src/google/cacheinvalidation/v2/logging.h',
-        'files/src/google/cacheinvalidation/v2/mutex.h',
-        'files/src/google/cacheinvalidation/v2/object-id-digest-utils.cc',
-        'files/src/google/cacheinvalidation/v2/object-id-digest-utils.h',
-        'files/src/google/cacheinvalidation/v2/operation-scheduler.cc',
-        'files/src/google/cacheinvalidation/v2/operation-scheduler.h',
-        'files/src/google/cacheinvalidation/v2/persistence-utils.cc',
-        'files/src/google/cacheinvalidation/v2/persistence-utils.h',
-        'files/src/google/cacheinvalidation/v2/proto-converter.cc',
-        'files/src/google/cacheinvalidation/v2/proto-converter.h',
-        'files/src/google/cacheinvalidation/v2/proto-helpers.h',
-        'files/src/google/cacheinvalidation/v2/proto-helpers.cc',
-        'files/src/google/cacheinvalidation/v2/protocol-handler.cc',
-        'files/src/google/cacheinvalidation/v2/protocol-handler.h',
-        'files/src/google/cacheinvalidation/v2/registration-manager.cc',
-        'files/src/google/cacheinvalidation/v2/registration-manager.h',
-        'files/src/google/cacheinvalidation/v2/run-state.h',
-        'files/src/google/cacheinvalidation/v2/sha1-digest-function.h',
-        'files/src/google/cacheinvalidation/v2/simple-registration-store.cc',
-        'files/src/google/cacheinvalidation/v2/simple-registration-store.h',
-        'files/src/google/cacheinvalidation/v2/smearer.h',
-        'files/src/google/cacheinvalidation/v2/statistics.cc',
-        'files/src/google/cacheinvalidation/v2/statistics.h',
-        'files/src/google/cacheinvalidation/v2/string_util.h',
-        'files/src/google/cacheinvalidation/v2/system-resources.h',
-        'files/src/google/cacheinvalidation/v2/throttle.cc',
-        'files/src/google/cacheinvalidation/v2/throttle.h',
-        'files/src/google/cacheinvalidation/v2/ticl-message-validator.cc',
-        'files/src/google/cacheinvalidation/v2/ticl-message-validator.h',
-        'files/src/google/cacheinvalidation/v2/time.h',
-        'files/src/google/cacheinvalidation/v2/types.h',
+        'overrides/google/cacheinvalidation/deps/callback.h',
+        'overrides/google/cacheinvalidation/deps/gmock.h',
+        'overrides/google/cacheinvalidation/deps/googletest.h',
+        'overrides/google/cacheinvalidation/deps/logging.h',
+        'overrides/google/cacheinvalidation/deps/mutex.h',
+        'overrides/google/cacheinvalidation/deps/random.h',
+        'overrides/google/cacheinvalidation/deps/sha1-digest-function.h',
+        'overrides/google/cacheinvalidation/deps/scoped_ptr.h',
+        'overrides/google/cacheinvalidation/deps/stl-namespace.h',
+        'overrides/google/cacheinvalidation/deps/string_util.h',
+        'overrides/google/cacheinvalidation/deps/time.h',
+        'files/src/google/cacheinvalidation/deps/digest-function.h',
+        'files/src/google/cacheinvalidation/impl/basic-system-resources.cc',
+        'files/src/google/cacheinvalidation/impl/basic-system-resources.h',
+        'files/src/google/cacheinvalidation/impl/checking-invalidation-listener.cc',
+        'files/src/google/cacheinvalidation/impl/checking-invalidation-listener.h',
+        'files/src/google/cacheinvalidation/impl/client-protocol-namespace-fix.h',
+        'files/src/google/cacheinvalidation/impl/constants.cc',
+        'files/src/google/cacheinvalidation/impl/constants.h',
+        'files/src/google/cacheinvalidation/impl/digest-store.h',
+        'files/src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.cc',
+        'files/src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.h',
+        'files/src/google/cacheinvalidation/impl/invalidation-client-factory.cc',
+        'files/src/google/cacheinvalidation/impl/invalidation-client-impl.cc',
+        'files/src/google/cacheinvalidation/impl/invalidation-client-impl.h',
+        'files/src/google/cacheinvalidation/impl/invalidation-client-util.h',
+        'files/src/google/cacheinvalidation/impl/log-macro.h',
+        'files/src/google/cacheinvalidation/impl/object-id-digest-utils.cc',
+        'files/src/google/cacheinvalidation/impl/object-id-digest-utils.h',
+        'files/src/google/cacheinvalidation/impl/persistence-utils.cc',
+        'files/src/google/cacheinvalidation/impl/persistence-utils.h',
+        'files/src/google/cacheinvalidation/impl/proto-converter.cc',
+        'files/src/google/cacheinvalidation/impl/proto-converter.h',
+        'files/src/google/cacheinvalidation/impl/proto-helpers.h',
+        'files/src/google/cacheinvalidation/impl/proto-helpers.cc',
+        'files/src/google/cacheinvalidation/impl/protocol-handler.cc',
+        'files/src/google/cacheinvalidation/impl/protocol-handler.h',
+        'files/src/google/cacheinvalidation/impl/recurring-task.cc',
+        'files/src/google/cacheinvalidation/impl/recurring-task.h',
+        'files/src/google/cacheinvalidation/impl/registration-manager.cc',
+        'files/src/google/cacheinvalidation/impl/registration-manager.h',
+        'files/src/google/cacheinvalidation/impl/run-state.h',
+        'files/src/google/cacheinvalidation/impl/safe-storage.cc',
+        'files/src/google/cacheinvalidation/impl/safe-storage.h',
+        'files/src/google/cacheinvalidation/impl/simple-registration-store.cc',
+        'files/src/google/cacheinvalidation/impl/simple-registration-store.h',
+        'files/src/google/cacheinvalidation/impl/smearer.h',
+        'files/src/google/cacheinvalidation/impl/statistics.cc',
+        'files/src/google/cacheinvalidation/impl/statistics.h',
+        'files/src/google/cacheinvalidation/impl/throttle.cc',
+        'files/src/google/cacheinvalidation/impl/throttle.h',
+        'files/src/google/cacheinvalidation/impl/ticl-message-validator.cc',
+        'files/src/google/cacheinvalidation/impl/ticl-message-validator.h',
+        'files/src/google/cacheinvalidation/include/invalidation-client.h',
+        'files/src/google/cacheinvalidation/include/invalidation-client-factory.h',
+        'files/src/google/cacheinvalidation/include/invalidation-listener.h',
+        'files/src/google/cacheinvalidation/include/system-resources.h',
+        'files/src/google/cacheinvalidation/include/types.h',
       ],
       'include_dirs': [
         './overrides',
@@ -193,15 +191,16 @@
       'type': 'executable',
       'sources': [
         '../../base/test/run_all_unittests.cc',
-        'files/src/google/cacheinvalidation/v2/test/deterministic-scheduler.cc',
-        'files/src/google/cacheinvalidation/v2/test/deterministic-scheduler.h',
-        'files/src/google/cacheinvalidation/v2/test/test-logger.cc',
-        'files/src/google/cacheinvalidation/v2/test/test-logger.h',
-        'files/src/google/cacheinvalidation/v2/test/test-utils.cc',
-        'files/src/google/cacheinvalidation/v2/test/test-utils.h',
-        'files/src/google/cacheinvalidation/v2/invalidation-client-impl_test.cc',
-        'files/src/google/cacheinvalidation/v2/protocol-handler_test.cc',
-        'files/src/google/cacheinvalidation/v2/throttle_test.cc',
+        'files/src/google/cacheinvalidation/test/deterministic-scheduler.cc',
+        'files/src/google/cacheinvalidation/test/deterministic-scheduler.h',
+        'files/src/google/cacheinvalidation/test/test-logger.cc',
+        'files/src/google/cacheinvalidation/test/test-logger.h',
+        'files/src/google/cacheinvalidation/test/test-utils.cc',
+        'files/src/google/cacheinvalidation/test/test-utils.h',
+        'files/src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc',
+        'files/src/google/cacheinvalidation/impl/protocol-handler_test.cc',
+        'files/src/google/cacheinvalidation/impl/recurring-task_test.cc',
+        'files/src/google/cacheinvalidation/impl/throttle_test.cc',
       ],
       'dependencies': [
         '../../base/base.gyp:base',