diff options
28 files changed, 155 insertions, 152 deletions
@@ -107,7 +107,7 @@ deps = { "src/third_party/cacheinvalidation/files/src/google": (Var("googlecode_url") % "google-cache-invalidation-api") + - "/trunk/src/google@185", + "/trunk/src/google@200", "src/third_party/leveldatabase/src": (Var("googlecode_url") % "leveldb") + "/trunk@61", diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc index 53f7ce2..1b1769b 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc @@ -12,10 +12,10 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/string_number_conversions.h" +#include "google/cacheinvalidation/impl/constants.h" +#include "google/cacheinvalidation/include/invalidation-client.h" +#include "google/cacheinvalidation/include/system-resources.h" #include "google/cacheinvalidation/v2/client_gateway.pb.h" -#include "google/cacheinvalidation/v2/constants.h" -#include "google/cacheinvalidation/v2/invalidation-client.h" -#include "google/cacheinvalidation/v2/system-resources.h" #include "jingle/notifier/listener/notification_constants.h" #include "jingle/notifier/listener/push_notifications_send_update_task.h" #include "jingle/notifier/listener/xml_element_util.h" diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h index 5378c5e..dfd8b81 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "google/cacheinvalidation/v2/system-resources.h" +#include "google/cacheinvalidation/include/system-resources.h" #include "jingle/notifier/listener/push_notifications_listen_task.h" #include "jingle/notifier/listener/push_notifications_subscribe_task.h" diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc index e7d8d06..e577e69 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc @@ -7,15 +7,15 @@ #include "base/base64.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "google/cacheinvalidation/v2/callback.h" +#include "google/cacheinvalidation/deps/callback.h" +#include "google/cacheinvalidation/include/system-resources.h" #include "google/cacheinvalidation/v2/client_gateway.pb.h" -#include "google/cacheinvalidation/v2/system-resources.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/listener/notification_defines.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" #include "talk/base/task.h" #include "talk/xmpp/asyncsocket.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.cc b/chrome/browser/sync/notifier/chrome_invalidation_client.cc index 6faa537..ece8e97 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client.cc +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.cc @@ -14,8 +14,9 @@ #include "chrome/browser/sync/notifier/invalidation_util.h" #include "chrome/browser/sync/notifier/registration_manager.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "google/cacheinvalidation/v2/invalidation-client.h" -#include "google/cacheinvalidation/v2/invalidation-client-factory.h" +#include "google/cacheinvalidation/include/invalidation-client-factory.h" +#include "google/cacheinvalidation/include/invalidation-client.h" +#include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" namespace { diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.h b/chrome/browser/sync/notifier/chrome_invalidation_client.h index 89d2a07..74622fd 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client.h +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -22,7 +22,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" -#include "google/cacheinvalidation/v2/invalidation-listener.h" +#include "google/cacheinvalidation/include/invalidation-listener.h" // TODO(akalin): Move invalidation::InvalidationListener into its own // file and include that instead of invalidation-client.h (which diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc b/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc index a3555ca..403e3f8 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc +++ b/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,8 +10,8 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" -#include "google/cacheinvalidation/v2/invalidation-client.h" -#include "google/cacheinvalidation/v2/types.h" +#include "google/cacheinvalidation/include/invalidation-client.h" +#include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" #include "jingle/notifier/base/fake_base_task.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/notifier/chrome_system_resources.cc b/chrome/browser/sync/notifier/chrome_system_resources.cc index db13317..927a633 100644 --- a/chrome/browser/sync/notifier/chrome_system_resources.cc +++ b/chrome/browser/sync/notifier/chrome_system_resources.cc @@ -16,7 +16,7 @@ #include "base/stringprintf.h" #include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h" #include "chrome/browser/sync/notifier/invalidation_util.h" -#include "google/cacheinvalidation/v2/types.h" +#include "google/cacheinvalidation/include/types.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/chrome_system_resources.h b/chrome/browser/sync/notifier/chrome_system_resources.h index 8614bd4..5536463 100644 --- a/chrome/browser/sync/notifier/chrome_system_resources.h +++ b/chrome/browser/sync/notifier/chrome_system_resources.h @@ -20,7 +20,7 @@ #include "base/message_loop.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/sync/notifier/state_writer.h" -#include "google/cacheinvalidation/v2/system-resources.h" +#include "google/cacheinvalidation/include/system-resources.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc b/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc index 4409802..7d819d0 100644 --- a/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc +++ b/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "chrome/browser/sync/notifier/state_writer.h" -#include "google/cacheinvalidation/v2/types.h" +#include "google/cacheinvalidation/include/types.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/invalidation_util.cc b/chrome/browser/sync/notifier/invalidation_util.cc index e3756db..706c666 100644 --- a/chrome/browser/sync/notifier/invalidation_util.cc +++ b/chrome/browser/sync/notifier/invalidation_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,7 +6,7 @@ #include <sstream> -#include "google/cacheinvalidation/v2/types.h" +#include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/invalidation_util.h b/chrome/browser/sync/notifier/invalidation_util.h index 86d58d96..f1cdca5 100644 --- a/chrome/browser/sync/notifier/invalidation_util.h +++ b/chrome/browser/sync/notifier/invalidation_util.h @@ -11,7 +11,7 @@ #include <string> #include "chrome/browser/sync/syncable/model_type.h" -#include "google/cacheinvalidation/v2/callback.h" +#include "google/cacheinvalidation/deps/callback.h" namespace invalidation { diff --git a/chrome/browser/sync/notifier/registration_manager.cc b/chrome/browser/sync/notifier/registration_manager.cc index 1adb167..cd2fc86 100644 --- a/chrome/browser/sync/notifier/registration_manager.cc +++ b/chrome/browser/sync/notifier/registration_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,7 +11,8 @@ #include "base/rand_util.h" #include "chrome/browser/sync/notifier/invalidation_util.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "google/cacheinvalidation/v2/invalidation-client.h" +#include "google/cacheinvalidation/include/invalidation-client.h" +#include "google/cacheinvalidation/include/types.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/registration_manager.h b/chrome/browser/sync/notifier/registration_manager.h index bc853a7..796d6c4c 100644 --- a/chrome/browser/sync/notifier/registration_manager.h +++ b/chrome/browser/sync/notifier/registration_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -12,12 +12,12 @@ #include <map> #include "base/basictypes.h" +#include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" -#include "base/threading/non_thread_safe.h" #include "chrome/browser/sync/syncable/model_type.h" // For invalidation::InvalidationListener::RegistrationState. -#include "google/cacheinvalidation/v2/invalidation-listener.h" +#include "google/cacheinvalidation/include/invalidation-listener.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/chrome/browser/sync/notifier/registration_manager_unittest.cc index 2fba6fc..baf5cb4 100644 --- a/chrome/browser/sync/notifier/registration_manager_unittest.cc +++ b/chrome/browser/sync/notifier/registration_manager_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,7 +14,7 @@ #include "base/message_loop.h" #include "chrome/browser/sync/notifier/invalidation_util.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "google/cacheinvalidation/v2/invalidation-client.h" +#include "google/cacheinvalidation/include/invalidation-client.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { 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', diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/callback.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/callback.h index d1e9274..e1da19b3 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/callback.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/callback.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GOOGLE_CACHEINVALIDATION_V2_CALLBACK_H_ -#define GOOGLE_CACHEINVALIDATION_V2_CALLBACK_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_CALLBACK_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_CALLBACK_H_ #include "base/bind.h" #include "base/callback.h" @@ -123,4 +123,4 @@ Closure* NewPermanentCallback( } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_CALLBACK_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_CALLBACK_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/gmock.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/gmock.h index e6a121e..f85846f 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/gmock.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/gmock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GOOGLE_CACHEINVALIDATION_V2_GMOCK_H_ -#define GOOGLE_CACHEINVALIDATION_V2_GMOCK_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_GMOCK_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_GMOCK_H_ #include "testing/gmock/include/gmock/gmock.h" @@ -88,4 +88,4 @@ MATCHER_P(EqualsProto, message, "") { } // namespace testing -#endif // GOOGLE_CACHEINVALIDATION_V2_GMOCK_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_GMOCK_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/googletest.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/googletest.h index 46bd071..8623e8c 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/googletest.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/googletest.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GOOGLE_CACHEINVALIDATION_V2_GOOGLETEST_H_ -#define GOOGLE_CACHEINVALIDATION_V2_GOOGLETEST_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_GOOGLETEST_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_GOOGLETEST_H_ #include "testing/gtest/include/gtest/gtest.h" -#endif // GOOGLE_CACHEINVALIDATION_V2_GOOGLETEST_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_GOOGLETEST_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/logging.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/logging.h index a2f27f0..0c7c52f 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/logging.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/logging.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_V2_LOGGING_H_ -#define GOOGLE_CACHEINVALIDATION_V2_LOGGING_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_LOGGING_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_LOGGING_H_ #include "base/logging.h" @@ -13,4 +13,4 @@ using logging::LogMessage; } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_LOGGING_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_LOGGING_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/mutex.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h index 7eda283..1f0e23c 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/mutex.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_V2_MUTEX_H_ -#define GOOGLE_CACHEINVALIDATION_V2_MUTEX_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_MUTEX_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_MUTEX_H_ #include "base/logging.h" #include "base/synchronization/lock.h" @@ -23,4 +23,4 @@ class MutexLock { } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_MUTEX_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_MUTEX_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/random.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h index d8c586a..e43084e 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/random.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GOOGLE_CACHEINVALIDATION_V2_RANDOM_H_ -#define GOOGLE_CACHEINVALIDATION_V2_RANDOM_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_RANDOM_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_RANDOM_H_ #include "base/rand_util.h" @@ -14,12 +14,14 @@ class Random { // We don't actually use the seed. explicit Random(int64 seed) {} + virtual ~Random() {} + // Returns a pseudorandom value between(inclusive) and(exclusive). - double RandDouble() { + virtual double RandDouble() { return base::RandDouble(); } }; } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_RANDOM_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_RANDOM_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/scoped_ptr.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/scoped_ptr.h new file mode 100644 index 0000000..b849a40 --- /dev/null +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/scoped_ptr.h @@ -0,0 +1,16 @@ +// Copyright (c) 2012 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_DEPS_SCOPED_PTR_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_SCOPED_PTR_H_ + +#include "base/memory/scoped_ptr.h" + +namespace invalidation { + +using ::scoped_ptr; + +} // namespace invalidation + +#endif // GOOGLE_CACHEINVALIDATION_DEPS_SCOPED_PTR_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/sha1-digest-function.h index a22e3f2..d12c971 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/sha1-digest-function.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/sha1-digest-function.h @@ -4,14 +4,14 @@ // Interface to SHA1 digest computation. -#ifndef GOOGLE_CACHEINVALIDATION_V2_SHA1_DIGEST_FUNCTION_H_ -#define GOOGLE_CACHEINVALIDATION_V2_SHA1_DIGEST_FUNCTION_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_SHA1_DIGEST_FUNCTION_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_SHA1_DIGEST_FUNCTION_H_ #include <string> #include "base/sha1.h" -#include "google/cacheinvalidation/v2/digest-function.h" -#include "google/cacheinvalidation/v2/stl-namespace.h" +#include "google/cacheinvalidation/deps/digest-function.h" +#include "google/cacheinvalidation/deps/stl-namespace.h" namespace invalidation { @@ -44,4 +44,4 @@ class Sha1DigestFunction : public DigestFunction { } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_SHA1_DIGEST_FUNCTION_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_SHA1_DIGEST_FUNCTION_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/stl-namespace.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/stl-namespace.h index c660cbd..352af0e 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/stl-namespace.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/stl-namespace.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GOOGLE_CACHEINVALIDATION_V2_STL_NAMESPACE_H_ -#define GOOGLE_CACHEINVALIDATION_V2_STL_NAMESPACE_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_ #define INVALIDATION_STL_NAMESPACE std -#endif // GOOGLE_CACHEINVALIDATION_V2_STL_NAMESPACE_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/string_util.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h index 1b7246d..c5dd13f 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/string_util.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_V2_STRING_UTIL_H_ -#define GOOGLE_CACHEINVALIDATION_V2_STRING_UTIL_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ #include "base/string_number_conversions.h" #include "base/stringprintf.h" @@ -15,4 +15,4 @@ using base::StringAppendV; } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_STRING_UTIL_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/time.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/time.h index b8644f5..53c77b4 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/time.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/time.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_V2_TIME_H_ -#define GOOGLE_CACHEINVALIDATION_V2_TIME_H_ +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_TIME_H_ +#define GOOGLE_CACHEINVALIDATION_DEPS_TIME_H_ #include "base/time.h" @@ -13,4 +13,4 @@ typedef base::TimeTicks TimeTicks; typedef base::TimeDelta TimeDelta; } // namespace invalidation -#endif // GOOGLE_CACHEINVALIDATION_V2_TIME_H_ +#endif // GOOGLE_CACHEINVALIDATION_DEPS_TIME_H_ diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/scoped_ptr.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/scoped_ptr.h deleted file mode 100644 index 80ed3cc..0000000 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/v2/scoped_ptr.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2011 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_V2_SCOPED_PTR_H_ -#define GOOGLE_CACHEINVALIDATION_V2_SCOPED_PTR_H_ - -#include "base/memory/scoped_ptr.h" - -namespace invalidation { - -using ::scoped_ptr; - -} // namespace invalidation - -#endif // GOOGLE_CACHEINVALIDATION_V2_SCOPED_PTR_H_ |