Summary of changes to cacheinvalidation client:

- adds ResourceComponent and BasicSystemResources
- adds unit tests for ProtocolHandler
- adds delay before sending first message after restart, to avoid unnecessary and expensive invocation of registration sync protocol
- adds a check to prevent Start() from being called multiple times
- deletes all v1 code and overrides
- various internal cleanups and minor refactorings

Review URL: https://chromiumcodereview.appspot.com/9185038

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

1 files changed, 20 insertions, 11 deletions

diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 4e0ae02..5c5a2a7 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -28,6 +28,7 @@
       'type': 'none',
       'sources': [
         '<(proto_dir_root)/<(proto_dir_relpath)/client.proto',
+        '<(proto_dir_root)/<(proto_dir_relpath)/client_gateway.proto',
         '<(proto_dir_root)/<(proto_dir_relpath)/client_protocol.proto',
         '<(proto_dir_root)/<(proto_dir_relpath)/client_test_internal.proto',
         '<(proto_dir_root)/<(proto_dir_relpath)/types.proto',
@@ -67,6 +68,8 @@
       'sources': [
         '<(protoc_out_dir)/<(proto_dir_relpath)/client.pb.h',
         '<(protoc_out_dir)/<(proto_dir_relpath)/client.pb.cc',
+        '<(protoc_out_dir)/<(proto_dir_relpath)/client_gateway.pb.h',
+        '<(protoc_out_dir)/<(proto_dir_relpath)/client_gateway.pb.cc',
         '<(protoc_out_dir)/<(proto_dir_relpath)/client_protocol.pb.h',
         '<(protoc_out_dir)/<(proto_dir_relpath)/client_protocol.pb.cc',
         '<(protoc_out_dir)/<(proto_dir_relpath)/client_test_internal.pb.h',
@@ -99,27 +102,29 @@
       'target_name': 'cacheinvalidation',
       'type': 'static_library',
       'sources': [
-        'overrides/google/cacheinvalidation/callback.h',
-        'overrides/google/cacheinvalidation/compiler-specific.h',
-        'overrides/google/cacheinvalidation/gmock.h',
-        'overrides/google/cacheinvalidation/googletest.h',
+        '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/md5.h',
         'overrides/google/cacheinvalidation/v2/mutex.h',
-        'overrides/google/cacheinvalidation/random.h',
+        'overrides/google/cacheinvalidation/v2/random.h',
         'overrides/google/cacheinvalidation/v2/scoped_ptr.h',
-        'overrides/google/cacheinvalidation/stl-namespace.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.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.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',
@@ -153,8 +158,8 @@
         '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.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',
       ],
@@ -188,8 +193,12 @@
       '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/throttle_test.cc',
+        'files/src/google/cacheinvalidation/v2/test/test-logger.cc',
+        'files/src/google/cacheinvalidation/v2/test/test-logger.h',
+        'files/src/google/cacheinvalidation/v2/protocol-handler_test.cc',
+        'files/src/google/cacheinvalidation/v2/throttle_test.cc',
       ],
       'dependencies': [
         '../../base/base.gyp:base',