diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/invalidation_util.cc | 29 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/invalidation_util.h | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 6 |
4 files changed, 22 insertions, 17 deletions
@@ -52,7 +52,7 @@ deps = { (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106", "src/third_party/cacheinvalidation/files": - (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@56", + (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@60", "src/tools/gyp": (Var("googlecode_url") % "gyp") + "/trunk@857", diff --git a/chrome/browser/sync/notifier/invalidation_util.cc b/chrome/browser/sync/notifier/invalidation_util.cc index a5bc60a..a0f16b5 100644 --- a/chrome/browser/sync/notifier/invalidation_util.cc +++ b/chrome/browser/sync/notifier/invalidation_util.cc @@ -20,8 +20,7 @@ bool RealModelTypeToObjectId(syncable::ModelType model_type, model_type, ¬ification_type)) { return false; } - object_id->mutable_name()->set_string_value(notification_type); - object_id->set_source(invalidation::ObjectId::CHROME_SYNC); + object_id->Init(invalidation::ObjectSource::CHROME_SYNC, notification_type); return true; } @@ -29,19 +28,27 @@ bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id, syncable::ModelType* model_type) { return syncable::NotificationTypeToRealModelType( - object_id.name().string_value(), model_type); + object_id.name(), model_type); } std::string ObjectIdToString( const invalidation::ObjectId& object_id) { std::stringstream ss; ss << "{ "; - ss << "name: " << object_id.name().string_value() << ", "; + ss << "name: " << object_id.name() << ", "; ss << "source: " << object_id.source(); ss << " }"; return ss.str(); } +std::string ObjectIdPToString( + const invalidation::ObjectIdP& object_id) { + return ObjectIdToString( + invalidation::ObjectId( + (invalidation::ObjectSource_Type) object_id.source(), + object_id.name().string_value())); +} + std::string StatusToString( const invalidation::Status& status) { std::stringstream ss; @@ -57,17 +64,7 @@ std::string InvalidationToString( std::stringstream ss; ss << "{ "; ss << "object_id: " << ObjectIdToString(invalidation.object_id()) << ", "; - ss << "version: " << invalidation.version() << ", "; - ss << "components: { "; - const invalidation::ComponentStampLog& component_stamp_log = - invalidation.component_stamp_log(); - for (int i = 0; i < component_stamp_log.stamp_size(); ++i) { - const invalidation::ComponentStamp& component_stamp = - component_stamp_log.stamp(i); - ss << "component: " << component_stamp.component() << ", "; - ss << "time: " << component_stamp.time() << ", "; - } - ss << " }"; + ss << "version: " << invalidation.version(); ss << " }"; return ss.str(); } @@ -77,7 +74,7 @@ std::string RegistrationUpdateToString( std::stringstream ss; ss << "{ "; ss << "type: " << update.type() << ", "; - ss << "object_id: " << ObjectIdToString(update.object_id()) << ", "; + ss << "object_id: " << ObjectIdPToString(update.object_id()) << ", "; ss << "version: " << update.version() << ", "; ss << "sequence_number: " << update.sequence_number(); ss << " }"; diff --git a/chrome/browser/sync/notifier/invalidation_util.h b/chrome/browser/sync/notifier/invalidation_util.h index 75a9f6b..639ecdf 100644 --- a/chrome/browser/sync/notifier/invalidation_util.h +++ b/chrome/browser/sync/notifier/invalidation_util.h @@ -28,6 +28,8 @@ bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id, std::string ObjectIdToString(const invalidation::ObjectId& object_id); +std::string ObjectIdPToString(const invalidation::ObjectIdP& object_id); + std::string StatusToString(const invalidation::Status& status); std::string InvalidationToString( diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 60d64cb..cc3e476 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -24,6 +24,7 @@ 'target_name': 'cacheinvalidation_proto', 'type': 'none', 'sources': [ + '<(proto_dir_root)/google/cacheinvalidation/internal.proto', '<(proto_dir_root)/google/cacheinvalidation/ticl_persistence.proto', '<(proto_dir_root)/google/cacheinvalidation/types.proto', ], @@ -64,6 +65,8 @@ 'target_name': 'cacheinvalidation', 'type': '<(library)', 'sources': [ + '<(protoc_out_dir)/<(proto_dir_relpath)/internal.pb.h', + '<(protoc_out_dir)/<(proto_dir_relpath)/internal.pb.cc', '<(protoc_out_dir)/<(proto_dir_relpath)/ticl_persistence.pb.h', '<(protoc_out_dir)/<(proto_dir_relpath)/ticl_persistence.pb.cc', '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.h', @@ -85,6 +88,7 @@ 'files/src/google/cacheinvalidation/invalidation-client-impl.h', 'files/src/google/cacheinvalidation/invalidation-client.cc', 'files/src/google/cacheinvalidation/invalidation-client.h', + 'files/src/google/cacheinvalidation/invalidation-types.h', 'files/src/google/cacheinvalidation/log-macro.h', 'files/src/google/cacheinvalidation/network-manager.cc', 'files/src/google/cacheinvalidation/network-manager.h', @@ -92,6 +96,8 @@ 'files/src/google/cacheinvalidation/persistence-manager.h', 'files/src/google/cacheinvalidation/persistence-utils.cc', 'files/src/google/cacheinvalidation/persistence-utils.h', + 'files/src/google/cacheinvalidation/proto-converter.cc', + 'files/src/google/cacheinvalidation/proto-converter.h', 'files/src/google/cacheinvalidation/registration-update-manager.cc', 'files/src/google/cacheinvalidation/registration-update-manager.h', 'files/src/google/cacheinvalidation/session-manager.cc', |