diff options
50 files changed, 506 insertions, 447 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index cefe326..6dfd047 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/chrome/browser/sync/glue/sync_backend_host.h @@ -157,7 +157,7 @@ class SyncBackendHost : public sync_driver::BackendDataTypeConfigurer { // the non-blocking sync types to communicate with the server. // // Should be called only when the backend is initialized. - virtual scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() = 0; + virtual scoped_ptr<syncer_v2::SyncContextProxy> GetSyncContextProxy() = 0; // Called from any thread to obtain current status information in detailed or // summarized form. diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc index 75ada09..0c35413 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc @@ -458,11 +458,11 @@ syncer::UserShare* SyncBackendHostImpl::GetUserShare() const { return core_->sync_manager()->GetUserShare(); } -scoped_ptr<syncer::SyncContextProxy> +scoped_ptr<syncer_v2::SyncContextProxy> SyncBackendHostImpl::GetSyncContextProxy() { - return sync_context_proxy_.get() ? scoped_ptr<syncer::SyncContextProxy>( + return sync_context_proxy_.get() ? scoped_ptr<syncer_v2::SyncContextProxy>( sync_context_proxy_->Clone()) - : scoped_ptr<syncer::SyncContextProxy>(); + : scoped_ptr<syncer_v2::SyncContextProxy>(); } SyncBackendHostImpl::Status SyncBackendHostImpl::GetDetailedStatus() { @@ -625,7 +625,7 @@ void SyncBackendHostImpl::HandleInitializationSuccessOnFrontendLoop( const syncer::WeakHandle<syncer::JsBackend> js_backend, const syncer::WeakHandle<syncer::DataTypeDebugInfoListener> debug_info_listener, - syncer::SyncContextProxy* sync_context_proxy, + syncer_v2::SyncContextProxy* sync_context_proxy, const std::string& cache_guid) { DCHECK_EQ(base::MessageLoop::current(), frontend_loop_); diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h index ff27d56..93c5300 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.h +++ b/chrome/browser/sync/glue/sync_backend_host_impl.h @@ -113,7 +113,7 @@ class SyncBackendHostImpl void DeactivateDataType(syncer::ModelType type) override; void EnableEncryptEverything() override; syncer::UserShare* GetUserShare() const override; - scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() override; + scoped_ptr<syncer_v2::SyncContextProxy> GetSyncContextProxy() override; Status GetDetailedStatus() override; syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot() const override; bool HasUnsyncedItems() const override; @@ -177,7 +177,7 @@ class SyncBackendHostImpl const syncer::WeakHandle<syncer::JsBackend> js_backend, const syncer::WeakHandle<syncer::DataTypeDebugInfoListener> debug_info_listener, - syncer::SyncContextProxy* sync_context_proxy, + syncer_v2::SyncContextProxy* sync_context_proxy, const std::string& cache_guid); // Forwards a ProtocolEvent to the frontend. Will not be called unless a @@ -323,7 +323,7 @@ class SyncBackendHostImpl scoped_refptr<SyncBackendHostCore> core_; // A handle referencing the main interface for non-blocking sync types. - scoped_ptr<syncer::SyncContextProxy> sync_context_proxy_; + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_; bool initialized_; diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.cc b/chrome/browser/sync/glue/sync_backend_host_mock.cc index 1f0d68f..3747ee9 100644 --- a/chrome/browser/sync/glue/sync_backend_host_mock.cc +++ b/chrome/browser/sync/glue/sync_backend_host_mock.cc @@ -75,9 +75,9 @@ syncer::UserShare* SyncBackendHostMock::GetUserShare() const { return NULL; } -scoped_ptr<syncer::SyncContextProxy> +scoped_ptr<syncer_v2::SyncContextProxy> SyncBackendHostMock::GetSyncContextProxy() { - return scoped_ptr<syncer::SyncContextProxy>(); + return scoped_ptr<syncer_v2::SyncContextProxy>(); } SyncBackendHost::Status SyncBackendHostMock::GetDetailedStatus() { diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.h b/chrome/browser/sync/glue/sync_backend_host_mock.h index b338e93..a49e269 100644 --- a/chrome/browser/sync/glue/sync_backend_host_mock.h +++ b/chrome/browser/sync/glue/sync_backend_host_mock.h @@ -71,7 +71,7 @@ class SyncBackendHostMock : public SyncBackendHost { syncer::UserShare* GetUserShare() const override; - scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() override; + scoped_ptr<syncer_v2::SyncContextProxy> GetSyncContextProxy() override; Status GetDetailedStatus() override; diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync_driver/non_blocking_data_type_controller.cc index 4a5abc0..54d8071 100644 --- a/components/sync_driver/non_blocking_data_type_controller.cc +++ b/components/sync_driver/non_blocking_data_type_controller.cc @@ -31,7 +31,7 @@ void NonBlockingDataTypeController::InitializeType( } void NonBlockingDataTypeController::InitializeSyncContext( - scoped_ptr<syncer::SyncContextProxy> sync_context_proxy) { + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy) { DCHECK(!IsSyncBackendConnected()); sync_context_proxy_ = sync_context_proxy.Pass(); diff --git a/components/sync_driver/non_blocking_data_type_controller.h b/components/sync_driver/non_blocking_data_type_controller.h index 0d7026d..8ffb9be 100644 --- a/components/sync_driver/non_blocking_data_type_controller.h +++ b/components/sync_driver/non_blocking_data_type_controller.h @@ -69,7 +69,7 @@ class NonBlockingDataTypeController { // // This process may be reversed with ClearSyncContextProxy(). void InitializeSyncContext( - scoped_ptr<syncer::SyncContextProxy> sync_context_proxy); + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy); // Disconnect from the current SyncContextProxy. void ClearSyncContext(); @@ -129,7 +129,7 @@ class NonBlockingDataTypeController { // The SyncContextProxy that connects to the current sync backend. May be // NULL. - scoped_ptr<syncer::SyncContextProxy> sync_context_proxy_; + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_; DISALLOW_COPY_AND_ASSIGN(NonBlockingDataTypeController); }; diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc index d5a4473..9f8ea44 100644 --- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc +++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc @@ -19,8 +19,6 @@ namespace sync_driver { -class ModelTypeSyncWorker; - namespace { // A useless instance of ModelTypeSyncWorker. @@ -29,7 +27,7 @@ class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker { NullModelTypeSyncWorker(); ~NullModelTypeSyncWorker() override; - void EnqueueForCommit(const syncer::CommitRequestDataList& list) override; + void EnqueueForCommit(const syncer_v2::CommitRequestDataList& list) override; }; NullModelTypeSyncWorker::NullModelTypeSyncWorker() { @@ -39,7 +37,7 @@ NullModelTypeSyncWorker::~NullModelTypeSyncWorker() { } void NullModelTypeSyncWorker::EnqueueForCommit( - const syncer::CommitRequestDataList& list) { + const syncer_v2::CommitRequestDataList& list) { NOTREACHED() << "Not implemented."; } @@ -70,7 +68,7 @@ class MockSyncContext { }; // A proxy to the MockSyncContext that implements SyncContextProxy. -class MockSyncContextProxy : public syncer::SyncContextProxy { +class MockSyncContextProxy : public syncer_v2::SyncContextProxy { public: MockSyncContextProxy( MockSyncContext* sync_context, @@ -83,8 +81,8 @@ class MockSyncContextProxy : public syncer::SyncContextProxy { void ConnectTypeToSync( syncer::ModelType type, - const syncer::DataTypeState& data_type_state, - const syncer::UpdateResponseDataList& saved_pending_updates, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_proxy) override { // Normally we'd use ThreadTaskRunnerHandle::Get() as the TaskRunner @@ -106,7 +104,7 @@ class MockSyncContextProxy : public syncer::SyncContextProxy { type)); } - scoped_ptr<SyncContextProxy> Clone() const override { + scoped_ptr<syncer_v2::SyncContextProxy> Clone() const override { return scoped_ptr<SyncContextProxy>(new MockSyncContextProxy( mock_sync_context_, model_task_runner_, sync_task_runner_)); } diff --git a/components/sync_driver/non_blocking_data_type_manager.cc b/components/sync_driver/non_blocking_data_type_manager.cc index 391077f..d04064c 100644 --- a/components/sync_driver/non_blocking_data_type_manager.cc +++ b/components/sync_driver/non_blocking_data_type_manager.cc @@ -37,7 +37,7 @@ void NonBlockingDataTypeManager::InitializeType( } void NonBlockingDataTypeManager::ConnectSyncBackend( - scoped_ptr<syncer::SyncContextProxy> proxy) { + scoped_ptr<syncer_v2::SyncContextProxy> proxy) { for (NonBlockingDataTypeControllerMap::const_iterator it = non_blocking_data_type_controllers_.begin(); it != non_blocking_data_type_controllers_.end(); ++it) { diff --git a/components/sync_driver/non_blocking_data_type_manager.h b/components/sync_driver/non_blocking_data_type_manager.h index de9c3de..5752412 100644 --- a/components/sync_driver/non_blocking_data_type_manager.h +++ b/components/sync_driver/non_blocking_data_type_manager.h @@ -17,9 +17,12 @@ class SequencedTaskRunner; namespace syncer { class ModelTypeSyncProxyImpl; -class SyncContextProxy; } //namespace syncer +namespace syncer_v2 { +class SyncContextProxy; +} // namespace syncer_v2 + namespace sync_driver { class NonBlockingDataTypeController; @@ -49,7 +52,7 @@ class NonBlockingDataTypeManager { // Connects the sync backend, as represented by a SyncContextProxy, to the // NonBlockingDataTypeController on the UI thread. - void ConnectSyncBackend(scoped_ptr<syncer::SyncContextProxy> proxy); + void ConnectSyncBackend(scoped_ptr<syncer_v2::SyncContextProxy> proxy); // Disconnects the sync backend from the UI thread. Should be called // early on during shutdown, but the whole procedure is asynchronous so diff --git a/sync/engine/entity_tracker.cc b/sync/engine/entity_tracker.cc index ff22c54..b6d7a33 100644 --- a/sync/engine/entity_tracker.cc +++ b/sync/engine/entity_tracker.cc @@ -87,7 +87,7 @@ void EntityTracker::PrepareCommitProto(sync_pb::SyncEntity* commit_entity, int64* sequence_number) const { // Set ID if we have a server-assigned ID. Otherwise, it will be up to // our caller to assign a client-unique initial ID. - if (base_version_ != kUncommittedVersion) { + if (base_version_ != syncer_v2::kUncommittedVersion) { commit_entity->set_id_string(id_); } @@ -201,12 +201,13 @@ void EntityTracker::ReceiveUpdate(int64 version) { } } -bool EntityTracker::ReceivePendingUpdate(const UpdateResponseData& data) { +bool EntityTracker::ReceivePendingUpdate( + const syncer_v2::UpdateResponseData& data) { if (data.response_version < highest_gu_response_version_) return false; highest_gu_response_version_ = data.response_version; - pending_update_.reset(new UpdateResponseData(data)); + pending_update_.reset(new syncer_v2::UpdateResponseData(data)); ClearPendingCommit(); return true; } @@ -215,7 +216,7 @@ bool EntityTracker::HasPendingUpdate() const { return !!pending_update_; } -UpdateResponseData EntityTracker::GetPendingUpdate() const { +syncer_v2::UpdateResponseData EntityTracker::GetPendingUpdate() const { return *pending_update_; } @@ -247,7 +248,7 @@ bool EntityTracker::IsInConflict() const { } bool EntityTracker::IsServerKnown() const { - return base_version_ != kUncommittedVersion; + return base_version_ != syncer_v2::kUncommittedVersion; } void EntityTracker::ClearPendingCommit() { diff --git a/sync/engine/entity_tracker.h b/sync/engine/entity_tracker.h index f60af7d..8d40c91 100644 --- a/sync/engine/entity_tracker.h +++ b/sync/engine/entity_tracker.h @@ -11,9 +11,12 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "sync/base/sync_export.h" -#include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/protocol/sync.pb.h" +namespace syncer_v2 { +struct UpdateResponseData; +} // namespace syncer_v2 + namespace syncer { // Manages the pending commit and update state for an entity on the sync @@ -89,11 +92,11 @@ class SYNC_EXPORT EntityTracker { // Returns true if the tracker decides this item is worth keeping. Returns // false if the item is discarded, which could happen if the version number // is out of date. - bool ReceivePendingUpdate(const UpdateResponseData& data); + bool ReceivePendingUpdate(const syncer_v2::UpdateResponseData& data); // Functions to fetch the latest pending update. bool HasPendingUpdate() const; - UpdateResponseData GetPendingUpdate() const; + syncer_v2::UpdateResponseData GetPendingUpdate() const; // Clears the pending update. Allows us to resume regular commit behavior. void ClearPendingUpdate(); @@ -166,7 +169,7 @@ class SYNC_EXPORT EntityTracker { // An update for this item which can't be applied right now. The presence of // an pending update prevents commits. As of this writing, the only source // of pending updates is updates we can't decrypt right now. - scoped_ptr<UpdateResponseData> pending_update_; + scoped_ptr<syncer_v2::UpdateResponseData> pending_update_; DISALLOW_COPY_AND_ASSIGN(EntityTracker); }; diff --git a/sync/engine/model_type_entity.cc b/sync/engine/model_type_entity.cc index 3249a16..2417d39 100644 --- a/sync/engine/model_type_entity.cc +++ b/sync/engine/model_type_entity.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "sync/engine/model_type_entity.h" +#include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/syncable/syncable_util.h" namespace syncer { @@ -12,20 +13,12 @@ scoped_ptr<ModelTypeEntity> ModelTypeEntity::NewLocalItem( const sync_pb::EntitySpecifics& specifics, base::Time now) { return scoped_ptr<ModelTypeEntity>(new ModelTypeEntity( - 1, - 0, - 0, - kUncommittedVersion, - true, + 1, 0, 0, syncer_v2::kUncommittedVersion, true, std::string(), // Sync thread will assign the initial ID. syncable::GenerateSyncableHash(GetModelTypeFromSpecifics(specifics), client_tag), client_tag, // As non-unique name. - specifics, - false, - now, - now, - std::string())); + specifics, false, now, now, std::string())); } scoped_ptr<ModelTypeEntity> ModelTypeEntity::FromServerUpdate( @@ -146,7 +139,7 @@ void ModelTypeEntity::Delete() { } void ModelTypeEntity::InitializeCommitRequestData( - CommitRequestData* request) const { + syncer_v2::CommitRequestData* request) const { request->id = id_; request->client_tag_hash = client_tag_hash_; request->sequence_number = sequence_number_; @@ -180,7 +173,7 @@ void ModelTypeEntity::ClearTransientSyncState() { } void ModelTypeEntity::ClearSyncState() { - base_version_ = kUncommittedVersion; + base_version_ = syncer_v2::kUncommittedVersion; is_dirty_ = true; sequence_number_ = 1; commit_requested_sequence_number_ = 0; diff --git a/sync/engine/model_type_entity.h b/sync/engine/model_type_entity.h index e05d469..b7a6ddf 100644 --- a/sync/engine/model_type_entity.h +++ b/sync/engine/model_type_entity.h @@ -10,9 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "sync/base/sync_export.h" -#include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/protocol/sync.pb.h" +namespace syncer_v2 { +struct CommitRequestData; +} // namespace syncer_v2 + namespace syncer { // This is the model thread's representation of a SyncEntity. @@ -96,7 +99,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeEntity { // Initializes a message representing this item's uncommitted state // to be forwarded to the sync server for committing. - void InitializeCommitRequestData(CommitRequestData* request) const; + void InitializeCommitRequestData(syncer_v2::CommitRequestData* request) const; // Notes that the current version of this item has been queued for commit. void SetCommitRequestInProgress(); diff --git a/sync/engine/model_type_sync_proxy.h b/sync/engine/model_type_sync_proxy.h index 3c6e079..1568a3c 100644 --- a/sync/engine/model_type_sync_proxy.h +++ b/sync/engine/model_type_sync_proxy.h @@ -17,12 +17,12 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxy { virtual ~ModelTypeSyncProxy(); virtual void OnCommitCompleted( - const DataTypeState& type_state, - const CommitResponseDataList& response_list) = 0; + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) = 0; virtual void OnUpdateReceived( - const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) = 0; + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) = 0; }; } // namespace syncer diff --git a/sync/engine/model_type_sync_proxy_impl.cc b/sync/engine/model_type_sync_proxy_impl.cc index 4f9be48..1d5069c 100644 --- a/sync/engine/model_type_sync_proxy_impl.cc +++ b/sync/engine/model_type_sync_proxy_impl.cc @@ -40,7 +40,7 @@ ModelType ModelTypeSyncProxyImpl::GetModelType() const { } void ModelTypeSyncProxyImpl::Enable( - scoped_ptr<SyncContextProxy> sync_context_proxy) { + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy) { DCHECK(CalledOnValidThread()); DVLOG(1) << "Asked to enable " << ModelTypeToString(type_); @@ -50,7 +50,7 @@ void ModelTypeSyncProxyImpl::Enable( data_type_state_.progress_marker.set_data_type_id( GetSpecificsFieldNumberFromModelType(type_)); - UpdateResponseDataList saved_pending_updates = GetPendingUpdates(); + syncer_v2::UpdateResponseDataList saved_pending_updates = GetPendingUpdates(); sync_context_proxy_ = sync_context_proxy.Pass(); sync_context_proxy_->ConnectTypeToSync( GetModelType(), @@ -137,7 +137,7 @@ void ModelTypeSyncProxyImpl::Delete(const std::string& client_tag) { } void ModelTypeSyncProxyImpl::FlushPendingCommitRequests() { - CommitRequestDataList commit_requests; + syncer_v2::CommitRequestDataList commit_requests; // Don't bother sending anything if there's no one to send to. if (!IsConnected()) @@ -151,7 +151,7 @@ void ModelTypeSyncProxyImpl::FlushPendingCommitRequests() { for (EntityMap::const_iterator it = entities_.begin(); it != entities_.end(); ++it) { if (it->second->RequiresCommitRequest()) { - CommitRequestData request; + syncer_v2::CommitRequestData request; it->second->InitializeCommitRequestData(&request); commit_requests.push_back(request); it->second->SetCommitRequestInProgress(); @@ -163,14 +163,14 @@ void ModelTypeSyncProxyImpl::FlushPendingCommitRequests() { } void ModelTypeSyncProxyImpl::OnCommitCompleted( - const DataTypeState& type_state, - const CommitResponseDataList& response_list) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) { data_type_state_ = type_state; - for (CommitResponseDataList::const_iterator list_it = response_list.begin(); - list_it != response_list.end(); - ++list_it) { - const CommitResponseData& response_data = *list_it; + for (syncer_v2::CommitResponseDataList::const_iterator list_it = + response_list.begin(); + list_it != response_list.end(); ++list_it) { + const syncer_v2::CommitResponseData& response_data = *list_it; const std::string& client_tag_hash = response_data.client_tag_hash; EntityMap::const_iterator it = entities_.find(client_tag_hash); @@ -188,18 +188,18 @@ void ModelTypeSyncProxyImpl::OnCommitCompleted( } void ModelTypeSyncProxyImpl::OnUpdateReceived( - const DataTypeState& data_type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) { + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) { bool got_new_encryption_requirements = data_type_state_.encryption_key_name != data_type_state.encryption_key_name; data_type_state_ = data_type_state; - for (UpdateResponseDataList::const_iterator list_it = response_list.begin(); - list_it != response_list.end(); - ++list_it) { - const UpdateResponseData& response_data = *list_it; + for (syncer_v2::UpdateResponseDataList::const_iterator list_it = + response_list.begin(); + list_it != response_list.end(); ++list_it) { + const syncer_v2::UpdateResponseData& response_data = *list_it; const std::string& client_tag_hash = response_data.client_tag_hash; // If we're being asked to apply an update to this entity, this overrides @@ -244,21 +244,23 @@ void ModelTypeSyncProxyImpl::OnUpdateReceived( } // Save pending updates in the appropriate data structure. - for (UpdateResponseDataList::const_iterator list_it = pending_updates.begin(); - list_it != pending_updates.end(); - ++list_it) { - const UpdateResponseData& update = *list_it; + for (syncer_v2::UpdateResponseDataList::const_iterator list_it = + pending_updates.begin(); + list_it != pending_updates.end(); ++list_it) { + const syncer_v2::UpdateResponseData& update = *list_it; const std::string& client_tag_hash = update.client_tag_hash; UpdateMap::const_iterator lookup_it = pending_updates_map_.find(client_tag_hash); if (lookup_it == pending_updates_map_.end()) { pending_updates_map_.insert( - client_tag_hash, make_scoped_ptr(new UpdateResponseData(update))); + client_tag_hash, + make_scoped_ptr(new syncer_v2::UpdateResponseData(update))); } else if (lookup_it->second->response_version <= update.response_version) { pending_updates_map_.erase(lookup_it); pending_updates_map_.insert( - client_tag_hash, make_scoped_ptr(new UpdateResponseData(update))); + client_tag_hash, + make_scoped_ptr(new syncer_v2::UpdateResponseData(update))); } else { // Received update is stale, do not overwrite existing. } @@ -279,8 +281,8 @@ void ModelTypeSyncProxyImpl::OnUpdateReceived( // TODO: Persist the new data on disk. } -UpdateResponseDataList ModelTypeSyncProxyImpl::GetPendingUpdates() { - UpdateResponseDataList pending_updates_list; +syncer_v2::UpdateResponseDataList ModelTypeSyncProxyImpl::GetPendingUpdates() { + syncer_v2::UpdateResponseDataList pending_updates_list; for (UpdateMap::const_iterator it = pending_updates_map_.begin(); it != pending_updates_map_.end(); ++it) { @@ -302,7 +304,7 @@ void ModelTypeSyncProxyImpl::ClearSyncState() { it->second->ClearSyncState(); } pending_updates_map_.clear(); - data_type_state_ = DataTypeState(); + data_type_state_ = syncer_v2::DataTypeState(); } } // namespace syncer diff --git a/sync/engine/model_type_sync_proxy_impl.h b/sync/engine/model_type_sync_proxy_impl.h index 7faaa4c..2227c9a 100644 --- a/sync/engine/model_type_sync_proxy_impl.h +++ b/sync/engine/model_type_sync_proxy_impl.h @@ -14,9 +14,12 @@ #include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/protocol/sync.pb.h" +namespace syncer_v2 { +class SyncContextProxy; +} // namespace syncer_v2 + namespace syncer { -class SyncContextProxy; class ModelTypeEntity; class ModelTypeSyncWorker; @@ -46,7 +49,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { ModelType GetModelType() const; // Starts the handshake with the sync thread. - void Enable(scoped_ptr<SyncContextProxy> context_proxy); + void Enable(scoped_ptr<syncer_v2::SyncContextProxy> context_proxy); // Severs all ties to the sync thread and may delete local sync state. // Another call to Enable() can be used to re-establish this connection. @@ -68,14 +71,16 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { // Informs this object that some of its commit requests have been // successfully serviced. - void OnCommitCompleted(const DataTypeState& type_state, - const CommitResponseDataList& response_list); + void OnCommitCompleted( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list); // Informs this object that there are some incoming updates is should // handle. - void OnUpdateReceived(const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates); + void OnUpdateReceived( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates); // Returns the list of pending updates. // @@ -83,7 +88,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { // The current test harness setup doesn't allow us to test the data that the // proxy sends to the worker during initialization, so we use this to inspect // its state instead. - UpdateResponseDataList GetPendingUpdates(); + syncer_v2::UpdateResponseDataList GetPendingUpdates(); // Returns the long-lived WeakPtr that is intended to be registered with the // ProfileSyncService. @@ -92,7 +97,8 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { private: typedef base::ScopedPtrMap<std::string, scoped_ptr<ModelTypeEntity>> EntityMap; - typedef base::ScopedPtrMap<std::string, scoped_ptr<UpdateResponseData>> + typedef base::ScopedPtrMap<std::string, + scoped_ptr<syncer_v2::UpdateResponseData>> UpdateMap; // Sends all commit requests that are due to be sent to the sync thread. @@ -108,7 +114,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { void ClearSyncState(); ModelType type_; - DataTypeState data_type_state_; + syncer_v2::DataTypeState data_type_state_; // Whether or not sync is preferred for this type. This is a cached copy of // the canonical copy information on the UI thread. @@ -123,7 +129,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe { // // Beware of NULL pointers: This object is uninitialized when we are not // connected to sync. - scoped_ptr<SyncContextProxy> sync_context_proxy_; + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_; // Reference to the ModelTypeSyncWorker. // diff --git a/sync/engine/model_type_sync_proxy_impl_unittest.cc b/sync/engine/model_type_sync_proxy_impl_unittest.cc index 1b30219..5cee142 100644 --- a/sync/engine/model_type_sync_proxy_impl_unittest.cc +++ b/sync/engine/model_type_sync_proxy_impl_unittest.cc @@ -88,21 +88,23 @@ class ModelTypeSyncProxyImplTest : public ::testing::Test { bool HasPendingUpdate(const std::string& tag) const; // Returns the pending update with the specified tag. - UpdateResponseData GetPendingUpdate(const std::string& tag) const; + syncer_v2::UpdateResponseData GetPendingUpdate(const std::string& tag) const; // Returns the number of pending updates. size_t GetNumPendingUpdates() const; // Read emitted commit requests as batches. size_t GetNumCommitRequestLists(); - CommitRequestDataList GetNthCommitRequestList(size_t n); + syncer_v2::CommitRequestDataList GetNthCommitRequestList(size_t n); // Read emitted commit requests by tag, most recent only. bool HasCommitRequestForTag(const std::string& tag); - CommitRequestData GetLatestCommitRequestForTag(const std::string& tag); + syncer_v2::CommitRequestData GetLatestCommitRequestForTag( + const std::string& tag); // Sends the type sync proxy a successful commit response. - void SuccessfulCommitResponse(const CommitRequestData& request_data); + void SuccessfulCommitResponse( + const syncer_v2::CommitRequestData& request_data); // Sends the type sync proxy an updated DataTypeState to let it know that // the desired encryption key has changed. @@ -128,7 +130,7 @@ class ModelTypeSyncProxyImplTest : public ::testing::Test { scoped_ptr<InjectableSyncContextProxy> injectable_sync_context_proxy_; scoped_ptr<ModelTypeSyncProxyImpl> type_sync_proxy_; - DataTypeState data_type_state_; + syncer_v2::DataTypeState data_type_state_; }; ModelTypeSyncProxyImplTest::ModelTypeSyncProxyImplTest() @@ -191,7 +193,7 @@ void ModelTypeSyncProxyImplTest::DeleteItem(const std::string& tag) { void ModelTypeSyncProxyImplTest::OnInitialSyncDone() { data_type_state_.initial_sync_done = true; - UpdateResponseDataList empty_update_list; + syncer_v2::UpdateResponseDataList empty_update_list; type_sync_proxy_->OnUpdateReceived( data_type_state_, empty_update_list, empty_update_list); @@ -201,13 +203,13 @@ void ModelTypeSyncProxyImplTest::UpdateFromServer(int64 version_offset, const std::string& tag, const std::string& value) { const std::string tag_hash = GenerateTagHash(tag); - UpdateResponseData data = mock_worker_->UpdateFromServer( + syncer_v2::UpdateResponseData data = mock_worker_->UpdateFromServer( version_offset, tag_hash, GenerateSpecifics(tag, value)); - UpdateResponseDataList list; + syncer_v2::UpdateResponseDataList list; list.push_back(data); - type_sync_proxy_->OnUpdateReceived( - data_type_state_, list, UpdateResponseDataList()); + type_sync_proxy_->OnUpdateReceived(data_type_state_, list, + syncer_v2::UpdateResponseDataList()); } void ModelTypeSyncProxyImplTest::PendingUpdateFromServer( @@ -216,15 +218,14 @@ void ModelTypeSyncProxyImplTest::PendingUpdateFromServer( const std::string& value, const std::string& key_name) { const std::string tag_hash = GenerateTagHash(tag); - UpdateResponseData data = mock_worker_->UpdateFromServer( - version_offset, - tag_hash, + syncer_v2::UpdateResponseData data = mock_worker_->UpdateFromServer( + version_offset, tag_hash, GenerateEncryptedSpecifics(tag, value, key_name)); - UpdateResponseDataList list; + syncer_v2::UpdateResponseDataList list; list.push_back(data); - type_sync_proxy_->OnUpdateReceived( - data_type_state_, UpdateResponseDataList(), list); + type_sync_proxy_->OnUpdateReceived(data_type_state_, + syncer_v2::UpdateResponseDataList(), list); } void ModelTypeSyncProxyImplTest::TombstoneFromServer(int64 version_offset, @@ -232,41 +233,41 @@ void ModelTypeSyncProxyImplTest::TombstoneFromServer(int64 version_offset, // Overwrite the existing server version if this is the new highest version. std::string tag_hash = GenerateTagHash(tag); - UpdateResponseData data = + syncer_v2::UpdateResponseData data = mock_worker_->TombstoneFromServer(version_offset, tag_hash); - UpdateResponseDataList list; + syncer_v2::UpdateResponseDataList list; list.push_back(data); - type_sync_proxy_->OnUpdateReceived( - data_type_state_, list, UpdateResponseDataList()); + type_sync_proxy_->OnUpdateReceived(data_type_state_, list, + syncer_v2::UpdateResponseDataList()); } bool ModelTypeSyncProxyImplTest::HasPendingUpdate( const std::string& tag) const { const std::string client_tag_hash = GenerateTagHash(tag); - const UpdateResponseDataList list = type_sync_proxy_->GetPendingUpdates(); - for (UpdateResponseDataList::const_iterator it = list.begin(); - it != list.end(); - ++it) { + const syncer_v2::UpdateResponseDataList list = + type_sync_proxy_->GetPendingUpdates(); + for (syncer_v2::UpdateResponseDataList::const_iterator it = list.begin(); + it != list.end(); ++it) { if (it->client_tag_hash == client_tag_hash) return true; } return false; } -UpdateResponseData ModelTypeSyncProxyImplTest::GetPendingUpdate( +syncer_v2::UpdateResponseData ModelTypeSyncProxyImplTest::GetPendingUpdate( const std::string& tag) const { DCHECK(HasPendingUpdate(tag)); const std::string client_tag_hash = GenerateTagHash(tag); - const UpdateResponseDataList list = type_sync_proxy_->GetPendingUpdates(); - for (UpdateResponseDataList::const_iterator it = list.begin(); - it != list.end(); - ++it) { + const syncer_v2::UpdateResponseDataList list = + type_sync_proxy_->GetPendingUpdates(); + for (syncer_v2::UpdateResponseDataList::const_iterator it = list.begin(); + it != list.end(); ++it) { if (it->client_tag_hash == client_tag_hash) return *it; } NOTREACHED(); - return UpdateResponseData(); + return syncer_v2::UpdateResponseData(); } size_t ModelTypeSyncProxyImplTest::GetNumPendingUpdates() const { @@ -274,8 +275,8 @@ size_t ModelTypeSyncProxyImplTest::GetNumPendingUpdates() const { } void ModelTypeSyncProxyImplTest::SuccessfulCommitResponse( - const CommitRequestData& request_data) { - CommitResponseDataList list; + const syncer_v2::CommitRequestData& request_data) { + syncer_v2::CommitResponseDataList list; list.push_back(mock_worker_->SuccessfulCommitResponse(request_data)); type_sync_proxy_->OnCommitCompleted(data_type_state_, list); } @@ -283,8 +284,9 @@ void ModelTypeSyncProxyImplTest::SuccessfulCommitResponse( void ModelTypeSyncProxyImplTest::UpdateDesiredEncryptionKey( const std::string& key_name) { data_type_state_.encryption_key_name = key_name; - type_sync_proxy_->OnUpdateReceived( - data_type_state_, UpdateResponseDataList(), UpdateResponseDataList()); + type_sync_proxy_->OnUpdateReceived(data_type_state_, + syncer_v2::UpdateResponseDataList(), + syncer_v2::UpdateResponseDataList()); } void ModelTypeSyncProxyImplTest::SetServerEncryptionKey( @@ -323,8 +325,8 @@ size_t ModelTypeSyncProxyImplTest::GetNumCommitRequestLists() { return mock_worker_->GetNumCommitRequestLists(); } -CommitRequestDataList ModelTypeSyncProxyImplTest::GetNthCommitRequestList( - size_t n) { +syncer_v2::CommitRequestDataList +ModelTypeSyncProxyImplTest::GetNthCommitRequestList(size_t n) { return mock_worker_->GetNthCommitRequestList(n); } @@ -334,7 +336,8 @@ bool ModelTypeSyncProxyImplTest::HasCommitRequestForTag( return mock_worker_->HasCommitRequestForTagHash(tag_hash); } -CommitRequestData ModelTypeSyncProxyImplTest::GetLatestCommitRequestForTag( +syncer_v2::CommitRequestData +ModelTypeSyncProxyImplTest::GetLatestCommitRequestForTag( const std::string& tag) { const std::string tag_hash = GenerateTagHash(tag); return mock_worker_->GetLatestCommitRequestForTagHash(tag_hash); @@ -351,10 +354,11 @@ TEST_F(ModelTypeSyncProxyImplTest, CreateLocalItem) { // Verify the commit request this operation has triggered. EXPECT_EQ(1U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_data = + GetLatestCommitRequestForTag("tag1"); EXPECT_TRUE(tag1_data.id.empty()); - EXPECT_EQ(kUncommittedVersion, tag1_data.base_version); + EXPECT_EQ(syncer_v2::kUncommittedVersion, tag1_data.base_version); EXPECT_FALSE(tag1_data.ctime.is_null()); EXPECT_FALSE(tag1_data.mtime.is_null()); EXPECT_EQ("tag1", tag1_data.non_unique_name); @@ -372,13 +376,15 @@ TEST_F(ModelTypeSyncProxyImplTest, CreateAndModifyLocalItem) { WriteItem("tag1", "value1"); EXPECT_EQ(1U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v1_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v1_data = + GetLatestCommitRequestForTag("tag1"); WriteItem("tag1", "value2"); EXPECT_EQ(2U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v2_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v2_data = + GetLatestCommitRequestForTag("tag1"); // Test some of the relations between old and new commit requests. EXPECT_EQ(tag1_v1_data.specifics.preference().value(), "value1"); @@ -386,7 +392,7 @@ TEST_F(ModelTypeSyncProxyImplTest, CreateAndModifyLocalItem) { // Perform a thorough examination of the update-generated request. EXPECT_TRUE(tag1_v2_data.id.empty()); - EXPECT_EQ(kUncommittedVersion, tag1_v2_data.base_version); + EXPECT_EQ(syncer_v2::kUncommittedVersion, tag1_v2_data.base_version); EXPECT_FALSE(tag1_v2_data.ctime.is_null()); EXPECT_FALSE(tag1_v2_data.mtime.is_null()); EXPECT_EQ("tag1", tag1_v2_data.non_unique_name); @@ -415,17 +421,19 @@ TEST_F(ModelTypeSyncProxyImplTest, DeleteServerUnknown) { WriteItem("tag1", "value1"); EXPECT_EQ(1U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v1_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v1_data = + GetLatestCommitRequestForTag("tag1"); DeleteItem("tag1"); EXPECT_EQ(2U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v2_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v2_data = + GetLatestCommitRequestForTag("tag1"); EXPECT_GT(tag1_v2_data.sequence_number, tag1_v1_data.sequence_number); EXPECT_TRUE(tag1_v2_data.id.empty()); - EXPECT_EQ(kUncommittedVersion, tag1_v2_data.base_version); + EXPECT_EQ(syncer_v2::kUncommittedVersion, tag1_v2_data.base_version); EXPECT_TRUE(tag1_v2_data.deleted); } @@ -440,7 +448,8 @@ TEST_F(ModelTypeSyncProxyImplTest, DeleteServerUnknown_RacyCommitResponse) { WriteItem("tag1", "value1"); EXPECT_EQ(1U, GetNumCommitRequestLists()); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v1_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v1_data = + GetLatestCommitRequestForTag("tag1"); DeleteItem("tag1"); EXPECT_EQ(2U, GetNumCommitRequestLists()); @@ -576,7 +585,7 @@ TEST_F(ModelTypeSyncProxyImplTest, ReceivePendingUpdates) { PendingUpdateFromServer(5, "tag1", "value1", "key1"); EXPECT_EQ(1U, GetNumPendingUpdates()); ASSERT_TRUE(HasPendingUpdate("tag1")); - UpdateResponseData data1 = GetPendingUpdate("tag1"); + syncer_v2::UpdateResponseData data1 = GetPendingUpdate("tag1"); EXPECT_EQ(5, data1.response_version); // Receive an updated version of a pending update. @@ -584,7 +593,7 @@ TEST_F(ModelTypeSyncProxyImplTest, ReceivePendingUpdates) { PendingUpdateFromServer(10, "tag1", "value15", "key1"); EXPECT_EQ(1U, GetNumPendingUpdates()); ASSERT_TRUE(HasPendingUpdate("tag1")); - UpdateResponseData data2 = GetPendingUpdate("tag1"); + syncer_v2::UpdateResponseData data2 = GetPendingUpdate("tag1"); EXPECT_EQ(15, data2.response_version); // Receive a stale version of a pending update. @@ -592,7 +601,7 @@ TEST_F(ModelTypeSyncProxyImplTest, ReceivePendingUpdates) { PendingUpdateFromServer(-3, "tag1", "value12", "key1"); EXPECT_EQ(1U, GetNumPendingUpdates()); ASSERT_TRUE(HasPendingUpdate("tag1")); - UpdateResponseData data3 = GetPendingUpdate("tag1"); + syncer_v2::UpdateResponseData data3 = GetPendingUpdate("tag1"); EXPECT_EQ(15, data3.response_version); } @@ -633,7 +642,8 @@ TEST_F(ModelTypeSyncProxyImplTest, ReEncryptCommitsWithNewKey) { // Commit an item. WriteItem("tag1", "value1"); ASSERT_TRUE(HasCommitRequestForTag("tag1")); - const CommitRequestData& tag1_v1_data = GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag1_v1_data = + GetLatestCommitRequestForTag("tag1"); SuccessfulCommitResponse(tag1_v1_data); // Create another item and don't wait for its commit response. @@ -648,8 +658,10 @@ TEST_F(ModelTypeSyncProxyImplTest, ReEncryptCommitsWithNewKey) { ASSERT_EQ(3U, GetNumCommitRequestLists()); EXPECT_EQ(2U, GetNthCommitRequestList(2).size()); - const CommitRequestData& tag1_enc = GetLatestCommitRequestForTag("tag1"); - const CommitRequestData& tag2_enc = GetLatestCommitRequestForTag("tag2"); + const syncer_v2::CommitRequestData& tag1_enc = + GetLatestCommitRequestForTag("tag1"); + const syncer_v2::CommitRequestData& tag2_enc = + GetLatestCommitRequestForTag("tag2"); SuccessfulCommitResponse(tag1_enc); SuccessfulCommitResponse(tag2_enc); diff --git a/sync/engine/model_type_sync_worker.h b/sync/engine/model_type_sync_worker.h index 1396e1a..182d5db 100644 --- a/sync/engine/model_type_sync_worker.h +++ b/sync/engine/model_type_sync_worker.h @@ -16,7 +16,8 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncWorker { virtual ~ModelTypeSyncWorker(); // Entry point for the ModelTypeSyncProxy to send commit requests. - virtual void EnqueueForCommit(const CommitRequestDataList& list) = 0; + virtual void EnqueueForCommit( + const syncer_v2::CommitRequestDataList& list) = 0; }; } // namespace syncer diff --git a/sync/engine/model_type_sync_worker_impl.cc b/sync/engine/model_type_sync_worker_impl.cc index 62395ba..bc38db4 100644 --- a/sync/engine/model_type_sync_worker_impl.cc +++ b/sync/engine/model_type_sync_worker_impl.cc @@ -20,8 +20,8 @@ namespace syncer { ModelTypeSyncWorkerImpl::ModelTypeSyncWorkerImpl( ModelType type, - const DataTypeState& initial_state, - const UpdateResponseDataList& saved_pending_updates, + const syncer_v2::DataTypeState& initial_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, scoped_ptr<Cryptographer> cryptographer, NudgeHandler* nudge_handler, scoped_ptr<ModelTypeSyncProxy> type_sync_proxy) @@ -36,10 +36,9 @@ ModelTypeSyncWorkerImpl::ModelTypeSyncWorkerImpl( nudge_handler_->NudgeForInitialDownload(type_); } - for (UpdateResponseDataList::const_iterator it = + for (syncer_v2::UpdateResponseDataList::const_iterator it = saved_pending_updates.begin(); - it != saved_pending_updates.end(); - ++it) { + it != saved_pending_updates.end(); ++it) { scoped_ptr<EntityTracker> entity_tracker = EntityTracker::FromServerUpdate( it->id, it->client_tag_hash, it->response_version); entity_tracker->ReceivePendingUpdate(*it); @@ -102,8 +101,8 @@ SyncerError ModelTypeSyncWorkerImpl::ProcessGetUpdatesResponse( data_type_state_.type_context = mutated_context; data_type_state_.progress_marker = progress_marker; - UpdateResponseDataList response_datas; - UpdateResponseDataList pending_updates; + syncer_v2::UpdateResponseDataList response_datas; + syncer_v2::UpdateResponseDataList pending_updates; for (SyncEntityList::const_iterator update_it = applicable_updates.begin(); update_it != applicable_updates.end(); @@ -138,7 +137,7 @@ SyncerError ModelTypeSyncWorkerImpl::ProcessGetUpdatesResponse( } // Prepare the message for the model thread. - UpdateResponseData response_data; + syncer_v2::UpdateResponseData response_data; response_data.id = update_entity->id_string(); response_data.client_tag_hash = client_tag_hash; response_data.response_version = update_entity->version(); @@ -201,8 +200,9 @@ void ModelTypeSyncWorkerImpl::ApplyUpdates(sessions::StatusController* status) { data_type_state_.initial_sync_done = true; - type_sync_proxy_->OnUpdateReceived( - data_type_state_, UpdateResponseDataList(), UpdateResponseDataList()); + type_sync_proxy_->OnUpdateReceived(data_type_state_, + syncer_v2::UpdateResponseDataList(), + syncer_v2::UpdateResponseDataList()); } } @@ -214,16 +214,15 @@ void ModelTypeSyncWorkerImpl::PassiveApplyUpdates( } void ModelTypeSyncWorkerImpl::EnqueueForCommit( - const CommitRequestDataList& list) { + const syncer_v2::CommitRequestDataList& list) { DCHECK(CalledOnValidThread()); DCHECK(IsTypeInitialized()) << "Asked to commit items before type was initialized. " << "ModelType is: " << ModelTypeToString(type_); - for (CommitRequestDataList::const_iterator it = list.begin(); - it != list.end(); - ++it) { + for (syncer_v2::CommitRequestDataList::const_iterator it = list.begin(); + it != list.end(); ++it) { StorePendingCommit(*it); } @@ -268,7 +267,7 @@ scoped_ptr<CommitContribution> ModelTypeSyncWorkerImpl::GetContribution( } void ModelTypeSyncWorkerImpl::StorePendingCommit( - const CommitRequestData& request) { + const syncer_v2::CommitRequestData& request) { if (!request.deleted) { DCHECK_EQ(type_, GetModelTypeFromSpecifics(request.specifics)); } @@ -295,11 +294,10 @@ void ModelTypeSyncWorkerImpl::StorePendingCommit( } void ModelTypeSyncWorkerImpl::OnCommitResponse( - const CommitResponseDataList& response_list) { - for (CommitResponseDataList::const_iterator response_it = + const syncer_v2::CommitResponseDataList& response_list) { + for (syncer_v2::CommitResponseDataList::const_iterator response_it = response_list.begin(); - response_it != response_list.end(); - ++response_it) { + response_it != response_list.end(); ++response_it) { const std::string client_tag_hash = response_it->client_tag_hash; EntityMap::const_iterator map_it = entities_.find(client_tag_hash); @@ -353,7 +351,7 @@ void ModelTypeSyncWorkerImpl::HelpInitializeCommitEntity( // Initial commits need our help to generate a client ID. if (!sync_entity->has_id_string()) { - DCHECK_EQ(kUncommittedVersion, sync_entity->version()); + DCHECK_EQ(syncer_v2::kUncommittedVersion, sync_entity->version()); const int64 id = data_type_state_.next_client_id++; sync_entity->set_id_string( base::StringPrintf("%s-%" PRId64, ModelTypeToString(type_), id)); @@ -383,7 +381,7 @@ void ModelTypeSyncWorkerImpl::OnCryptographerUpdated() { DCHECK(cryptographer_); bool new_encryption_key = false; - UpdateResponseDataList response_datas; + syncer_v2::UpdateResponseDataList response_datas; const std::string& new_key_name = cryptographer_->GetDefaultNigoriKeyName(); @@ -398,14 +396,15 @@ void ModelTypeSyncWorkerImpl::OnCryptographerUpdated() { for (EntityMap::const_iterator it = entities_.begin(); it != entities_.end(); ++it) { if (it->second->HasPendingUpdate()) { - const UpdateResponseData& saved_pending = it->second->GetPendingUpdate(); + const syncer_v2::UpdateResponseData& saved_pending = + it->second->GetPendingUpdate(); // We assume all pending updates are encrypted items for which we // don't have the key. DCHECK(saved_pending.specifics.has_encrypted()); if (cryptographer_->CanDecrypt(saved_pending.specifics.encrypted())) { - UpdateResponseData decrypted_response = saved_pending; + syncer_v2::UpdateResponseData decrypted_response = saved_pending; if (DecryptSpecifics(cryptographer_.get(), saved_pending.specifics, &decrypted_response.specifics)) { @@ -424,8 +423,8 @@ void ModelTypeSyncWorkerImpl::OnCryptographerUpdated() { << base::StringPrintf( "Delivering encryption key and %zd decrypted updates.", response_datas.size()); - type_sync_proxy_->OnUpdateReceived( - data_type_state_, response_datas, UpdateResponseDataList()); + type_sync_proxy_->OnUpdateReceived(data_type_state_, response_datas, + syncer_v2::UpdateResponseDataList()); } } diff --git a/sync/engine/model_type_sync_worker_impl.h b/sync/engine/model_type_sync_worker_impl.h index 117f096..0534b5e 100644 --- a/sync/engine/model_type_sync_worker_impl.h +++ b/sync/engine/model_type_sync_worker_impl.h @@ -54,12 +54,13 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler, public ModelTypeSyncWorker, public base::NonThreadSafe { public: - ModelTypeSyncWorkerImpl(ModelType type, - const DataTypeState& initial_state, - const UpdateResponseDataList& saved_pending_updates, - scoped_ptr<Cryptographer> cryptographer, - NudgeHandler* nudge_handler, - scoped_ptr<ModelTypeSyncProxy> type_sync_proxy); + ModelTypeSyncWorkerImpl( + ModelType type, + const syncer_v2::DataTypeState& initial_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, + scoped_ptr<Cryptographer> cryptographer, + NudgeHandler* nudge_handler, + scoped_ptr<ModelTypeSyncProxy> type_sync_proxy); ~ModelTypeSyncWorkerImpl() override; ModelType GetModelType() const; @@ -80,13 +81,14 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler, void PassiveApplyUpdates(sessions::StatusController* status) override; // ModelTypeSyncWorker implementation. - void EnqueueForCommit(const CommitRequestDataList& request_list) override; + void EnqueueForCommit( + const syncer_v2::CommitRequestDataList& request_list) override; // CommitContributor implementation. scoped_ptr<CommitContribution> GetContribution(size_t max_entries) override; // Callback for when our contribution gets a response. - void OnCommitResponse(const CommitResponseDataList& response_list); + void OnCommitResponse(const syncer_v2::CommitResponseDataList& response_list); base::WeakPtr<ModelTypeSyncWorkerImpl> AsWeakPtr(); @@ -94,7 +96,7 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler, typedef base::ScopedPtrMap<std::string, scoped_ptr<EntityTracker>> EntityMap; // Stores a single commit request in this object's internal state. - void StorePendingCommit(const CommitRequestData& request); + void StorePendingCommit(const syncer_v2::CommitRequestData& request); // Returns true if this type has successfully fetched all available updates // from the server at least once. Our state may or may not be stale, but at @@ -134,7 +136,7 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler, ModelType type_; // State that applies to the entire model type. - DataTypeState data_type_state_; + syncer_v2::DataTypeState data_type_state_; // Pointer to the ModelTypeSyncProxy associated with this worker. // This is NULL when no proxy is connected.. diff --git a/sync/engine/model_type_sync_worker_impl_unittest.cc b/sync/engine/model_type_sync_worker_impl_unittest.cc index 934f3fa..d69c08c 100644 --- a/sync/engine/model_type_sync_worker_impl_unittest.cc +++ b/sync/engine/model_type_sync_worker_impl_unittest.cc @@ -73,11 +73,12 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test { // Initialize with some saved pending updates from the model thread. void InitializeWithPendingUpdates( - const UpdateResponseDataList& initial_pending_updates); + const syncer_v2::UpdateResponseDataList& initial_pending_updates); // Initialize with a custom initial DataTypeState and pending updates. - void InitializeWithState(const DataTypeState& state, - const UpdateResponseDataList& pending_updates); + void InitializeWithState( + const syncer_v2::DataTypeState& state, + const syncer_v2::UpdateResponseDataList& pending_updates); // Introduce a new key that the local cryptographer can't decrypt. void NewForeignEncryptionKey(); @@ -137,29 +138,32 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test { // Note that if the model thread is in non-blocking mode, this data will not // be updated until the response is actually processed by the model thread. size_t GetNumModelThreadUpdateResponses() const; - UpdateResponseDataList GetNthModelThreadUpdateResponse(size_t n) const; - UpdateResponseDataList GetNthModelThreadPendingUpdates(size_t n) const; - DataTypeState GetNthModelThreadUpdateState(size_t n) const; + syncer_v2::UpdateResponseDataList GetNthModelThreadUpdateResponse( + size_t n) const; + syncer_v2::UpdateResponseDataList GetNthModelThreadPendingUpdates( + size_t n) const; + syncer_v2::DataTypeState GetNthModelThreadUpdateState(size_t n) const; // Reads the latest update response datas on the model thread. // Note that if the model thread is in non-blocking mode, this data will not // be updated until the response is actually processed by the model thread. bool HasUpdateResponseOnModelThread(const std::string& tag) const; - UpdateResponseData GetUpdateResponseOnModelThread( + syncer_v2::UpdateResponseData GetUpdateResponseOnModelThread( const std::string& tag) const; // Read the latest commit messages received on the model thread. // Note that if the model thread is in non-blocking mode, this data will not // be updated until the response is actually processed by the model thread. size_t GetNumModelThreadCommitResponses() const; - CommitResponseDataList GetNthModelThreadCommitResponse(size_t n) const; - DataTypeState GetNthModelThreadCommitState(size_t n) const; + syncer_v2::CommitResponseDataList GetNthModelThreadCommitResponse( + size_t n) const; + syncer_v2::DataTypeState GetNthModelThreadCommitState(size_t n) const; // Reads the latest commit response datas on the model thread. // Note that if the model thread is in non-blocking mode, this data will not // be updated until the response is actually processed by the model thread. bool HasCommitResponseOnModelThread(const std::string& tag) const; - CommitResponseData GetCommitResponseOnModelThread( + syncer_v2::CommitResponseData GetCommitResponseOnModelThread( const std::string& tag) const; // Returns the number of commit nudges sent to the mock nudge handler. @@ -236,21 +240,21 @@ ModelTypeSyncWorkerImplTest::~ModelTypeSyncWorkerImplTest() { } void ModelTypeSyncWorkerImplTest::FirstInitialize() { - DataTypeState initial_state; + syncer_v2::DataTypeState initial_state; initial_state.progress_marker.set_data_type_id( GetSpecificsFieldNumberFromModelType(kModelType)); initial_state.next_client_id = 0; - InitializeWithState(initial_state, UpdateResponseDataList()); + InitializeWithState(initial_state, syncer_v2::UpdateResponseDataList()); } void ModelTypeSyncWorkerImplTest::NormalInitialize() { - InitializeWithPendingUpdates(UpdateResponseDataList()); + InitializeWithPendingUpdates(syncer_v2::UpdateResponseDataList()); } void ModelTypeSyncWorkerImplTest::InitializeWithPendingUpdates( - const UpdateResponseDataList& initial_pending_updates) { - DataTypeState initial_state; + const syncer_v2::UpdateResponseDataList& initial_pending_updates) { + syncer_v2::DataTypeState initial_state; initial_state.progress_marker.set_data_type_id( GetSpecificsFieldNumberFromModelType(kModelType)); initial_state.progress_marker.set_token("some_saved_progress_token"); @@ -265,8 +269,8 @@ void ModelTypeSyncWorkerImplTest::InitializeWithPendingUpdates( } void ModelTypeSyncWorkerImplTest::InitializeWithState( - const DataTypeState& state, - const UpdateResponseDataList& initial_pending_updates) { + const syncer_v2::DataTypeState& state, + const syncer_v2::UpdateResponseDataList& initial_pending_updates) { DCHECK(!worker_); // We don't get to own this object. The |worker_| keeps a scoped_ptr to it. @@ -355,17 +359,18 @@ void ModelTypeSyncWorkerImplTest::SetUpdateEncryptionFilter(int n) { void ModelTypeSyncWorkerImplTest::CommitRequest(const std::string& name, const std::string& value) { const std::string tag_hash = GenerateTagHash(name); - CommitRequestData data = mock_type_sync_proxy_->CommitRequest( + syncer_v2::CommitRequestData data = mock_type_sync_proxy_->CommitRequest( tag_hash, GenerateSpecifics(name, value)); - CommitRequestDataList list; + syncer_v2::CommitRequestDataList list; list.push_back(data); worker_->EnqueueForCommit(list); } void ModelTypeSyncWorkerImplTest::DeleteRequest(const std::string& tag) { const std::string tag_hash = GenerateTagHash(tag); - CommitRequestData data = mock_type_sync_proxy_->DeleteRequest(tag_hash); - CommitRequestDataList list; + syncer_v2::CommitRequestData data = + mock_type_sync_proxy_->DeleteRequest(tag_hash); + syncer_v2::CommitRequestDataList list; list.push_back(data); worker_->EnqueueForCommit(list); } @@ -509,20 +514,20 @@ size_t ModelTypeSyncWorkerImplTest::GetNumModelThreadUpdateResponses() const { return mock_type_sync_proxy_->GetNumUpdateResponses(); } -UpdateResponseDataList +syncer_v2::UpdateResponseDataList ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateResponse(size_t n) const { DCHECK_LT(n, GetNumModelThreadUpdateResponses()); return mock_type_sync_proxy_->GetNthUpdateResponse(n); } -UpdateResponseDataList +syncer_v2::UpdateResponseDataList ModelTypeSyncWorkerImplTest::GetNthModelThreadPendingUpdates(size_t n) const { DCHECK_LT(n, GetNumModelThreadUpdateResponses()); return mock_type_sync_proxy_->GetNthPendingUpdates(n); } -DataTypeState ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateState( - size_t n) const { +syncer_v2::DataTypeState +ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateState(size_t n) const { DCHECK_LT(n, GetNumModelThreadUpdateResponses()); return mock_type_sync_proxy_->GetNthTypeStateReceivedInUpdateResponse(n); } @@ -533,7 +538,8 @@ bool ModelTypeSyncWorkerImplTest::HasUpdateResponseOnModelThread( return mock_type_sync_proxy_->HasUpdateResponse(tag_hash); } -UpdateResponseData ModelTypeSyncWorkerImplTest::GetUpdateResponseOnModelThread( +syncer_v2::UpdateResponseData +ModelTypeSyncWorkerImplTest::GetUpdateResponseOnModelThread( const std::string& tag) const { const std::string tag_hash = GenerateTagHash(tag); return mock_type_sync_proxy_->GetUpdateResponse(tag_hash); @@ -543,14 +549,14 @@ size_t ModelTypeSyncWorkerImplTest::GetNumModelThreadCommitResponses() const { return mock_type_sync_proxy_->GetNumCommitResponses(); } -CommitResponseDataList +syncer_v2::CommitResponseDataList ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitResponse(size_t n) const { DCHECK_LT(n, GetNumModelThreadCommitResponses()); return mock_type_sync_proxy_->GetNthCommitResponse(n); } -DataTypeState ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitState( - size_t n) const { +syncer_v2::DataTypeState +ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitState(size_t n) const { DCHECK_LT(n, GetNumModelThreadCommitResponses()); return mock_type_sync_proxy_->GetNthTypeStateReceivedInCommitResponse(n); } @@ -561,7 +567,8 @@ bool ModelTypeSyncWorkerImplTest::HasCommitResponseOnModelThread( return mock_type_sync_proxy_->HasCommitResponse(tag_hash); } -CommitResponseData ModelTypeSyncWorkerImplTest::GetCommitResponseOnModelThread( +syncer_v2::CommitResponseData +ModelTypeSyncWorkerImplTest::GetCommitResponseOnModelThread( const std::string& tag) const { DCHECK(HasCommitResponseOnModelThread(tag)); const std::string tag_hash = GenerateTagHash(tag); @@ -673,7 +680,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleCommit) { const sync_pb::SyncEntity& entity = GetLatestCommitEntityOnServer("tag1"); EXPECT_FALSE(entity.id_string().empty()); EXPECT_EQ(kTypeParentId, entity.parent_id_string()); - EXPECT_EQ(kUncommittedVersion, entity.version()); + EXPECT_EQ(syncer_v2::kUncommittedVersion, entity.version()); EXPECT_NE(0, entity.mtime()); EXPECT_NE(0, entity.ctime()); EXPECT_FALSE(entity.name().empty()); @@ -686,7 +693,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleCommit) { ASSERT_EQ(1U, GetNumModelThreadCommitResponses()); EXPECT_EQ(1U, GetNthModelThreadCommitResponse(0).size()); ASSERT_TRUE(HasCommitResponseOnModelThread("tag1")); - const CommitResponseData& commit_response = + const syncer_v2::CommitResponseData& commit_response = GetCommitResponseOnModelThread("tag1"); // The ID changes in a commit response to initial commit. @@ -708,7 +715,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleDelete) { DoSuccessfulCommit(); ASSERT_TRUE(HasCommitResponseOnModelThread("tag1")); - const CommitResponseData& initial_commit_response = + const syncer_v2::CommitResponseData& initial_commit_response = GetCommitResponseOnModelThread("tag1"); int64 base_version = initial_commit_response.response_version; @@ -735,7 +742,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleDelete) { ASSERT_EQ(2U, GetNumModelThreadCommitResponses()); EXPECT_EQ(1U, GetNthModelThreadCommitResponse(1).size()); ASSERT_TRUE(HasCommitResponseOnModelThread("tag1")); - const CommitResponseData& commit_response = + const syncer_v2::CommitResponseData& commit_response = GetCommitResponseOnModelThread("tag1"); EXPECT_EQ(entity.id_string(), commit_response.id); @@ -779,7 +786,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SendInitialSyncDone) { EXPECT_EQ(0U, GetNthModelThreadUpdateResponse(0).size()); EXPECT_EQ(0U, GetNthModelThreadUpdateResponse(1).size()); - const DataTypeState& state = GetNthModelThreadUpdateState(1); + const syncer_v2::DataTypeState& state = GetNthModelThreadUpdateState(1); EXPECT_FALSE(state.progress_marker.token().empty()); EXPECT_FALSE(state.type_root_id.empty()); EXPECT_TRUE(state.initial_sync_done); @@ -834,11 +841,12 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveUpdates) { TriggerUpdateFromServer(10, "tag1", "value1"); ASSERT_EQ(1U, GetNumModelThreadUpdateResponses()); - UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0); + syncer_v2::UpdateResponseDataList updates_list = + GetNthModelThreadUpdateResponse(0); ASSERT_EQ(1U, updates_list.size()); ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1")); - UpdateResponseData update = GetUpdateResponseOnModelThread("tag1"); + syncer_v2::UpdateResponseData update = GetUpdateResponseOnModelThread("tag1"); EXPECT_FALSE(update.id.empty()); EXPECT_EQ(tag_hash, update.client_tag_hash); @@ -930,7 +938,8 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveDecryptableEntities) { // Test some basic properties regarding the update. ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1")); - UpdateResponseData update1 = GetUpdateResponseOnModelThread("tag1"); + syncer_v2::UpdateResponseData update1 = + GetUpdateResponseOnModelThread("tag1"); EXPECT_EQ("tag1", update1.specifics.preference().name()); EXPECT_EQ("value1", update1.specifics.preference().value()); EXPECT_TRUE(update1.encryption_key_name.empty()); @@ -943,7 +952,8 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveDecryptableEntities) { // Test its basic features and the value of encryption_key_name. ASSERT_TRUE(HasUpdateResponseOnModelThread("tag2")); - UpdateResponseData update2 = GetUpdateResponseOnModelThread("tag2"); + syncer_v2::UpdateResponseData update2 = + GetUpdateResponseOnModelThread("tag2"); EXPECT_EQ("tag2", update2.specifics.preference().name()); EXPECT_EQ("value2", update2.specifics.preference().value()); EXPECT_FALSE(update2.encryption_key_name.empty()); @@ -982,15 +992,17 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveUndecryptableEntries) { // updates will be undecryptable. They'll be transfered to the model thread // for safe-keeping as pending updates. ASSERT_EQ(1U, GetNumModelThreadUpdateResponses()); - UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0); + syncer_v2::UpdateResponseDataList updates_list = + GetNthModelThreadUpdateResponse(0); EXPECT_EQ(0U, updates_list.size()); - UpdateResponseDataList pending_updates = GetNthModelThreadPendingUpdates(0); + syncer_v2::UpdateResponseDataList pending_updates = + GetNthModelThreadPendingUpdates(0); EXPECT_EQ(1U, pending_updates.size()); // The update will be delivered as soon as decryption becomes possible. UpdateLocalCryptographer(); ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1")); - UpdateResponseData update = GetUpdateResponseOnModelThread("tag1"); + syncer_v2::UpdateResponseData update = GetUpdateResponseOnModelThread("tag1"); EXPECT_EQ("tag1", update.specifics.preference().name()); EXPECT_EQ("value1", update.specifics.preference().value()); EXPECT_FALSE(update.encryption_key_name.empty()); @@ -1013,16 +1025,18 @@ TEST_F(ModelTypeSyncWorkerImplTest, EncryptedUpdateOverridesPendingCommit) { // The encrypted update will be delivered to the model thread. ASSERT_EQ(1U, GetNumModelThreadUpdateResponses()); - UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0); + syncer_v2::UpdateResponseDataList updates_list = + GetNthModelThreadUpdateResponse(0); EXPECT_EQ(0U, updates_list.size()); - UpdateResponseDataList pending_updates = GetNthModelThreadPendingUpdates(0); + syncer_v2::UpdateResponseDataList pending_updates = + GetNthModelThreadPendingUpdates(0); EXPECT_EQ(1U, pending_updates.size()); } // Test decryption of pending updates saved across a restart. TEST_F(ModelTypeSyncWorkerImplTest, RestorePendingEntries) { // Create a fake pending update. - UpdateResponseData update; + syncer_v2::UpdateResponseData update; update.client_tag_hash = GenerateTagHash("tag1"); update.id = "SomeID"; @@ -1036,7 +1050,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestorePendingEntries) { EncryptUpdate(GetNthKeyParams(1), &(update.specifics)); // Inject the update during ModelTypeSyncWorker initialization. - UpdateResponseDataList saved_pending_updates; + syncer_v2::UpdateResponseDataList saved_pending_updates; saved_pending_updates.push_back(update); InitializeWithPendingUpdates(saved_pending_updates); @@ -1061,7 +1075,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestoreApplicableEntries) { UpdateLocalCryptographer(); // Create a fake pending update. - UpdateResponseData update; + syncer_v2::UpdateResponseData update; update.client_tag_hash = GenerateTagHash("tag1"); update.id = "SomeID"; update.response_version = 100; @@ -1074,7 +1088,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestoreApplicableEntries) { EncryptUpdate(GetNthKeyParams(1), &(update.specifics)); // Inject the update during ModelTypeSyncWorker initialization. - UpdateResponseDataList saved_pending_updates; + syncer_v2::UpdateResponseDataList saved_pending_updates; saved_pending_updates.push_back(update); InitializeWithPendingUpdates(saved_pending_updates); diff --git a/sync/engine/non_blocking_type_commit_contribution.cc b/sync/engine/non_blocking_type_commit_contribution.cc index 5df159f..a3793ff 100644 --- a/sync/engine/non_blocking_type_commit_contribution.cc +++ b/sync/engine/non_blocking_type_commit_contribution.cc @@ -48,7 +48,7 @@ SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse( bool commit_conflict = false; bool unknown_error = false; - CommitResponseDataList response_list; + syncer_v2::CommitResponseDataList response_list; for (size_t i = 0; i < sequence_numbers_.size(); ++i) { const sync_pb::CommitResponse_EntryResponse& entry_response = @@ -68,7 +68,7 @@ SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse( commit_conflict = true; break; case sync_pb::CommitResponse::SUCCESS: { - CommitResponseData response_data; + syncer_v2::CommitResponseData response_data; response_data.id = entry_response.id_string(); response_data.client_tag_hash = entities_.Get(i).client_defined_unique_tag(); diff --git a/sync/internal_api/public/non_blocking_sync_common.cc b/sync/internal_api/public/non_blocking_sync_common.cc index 983f29f..93cb6fa 100644 --- a/sync/internal_api/public/non_blocking_sync_common.cc +++ b/sync/internal_api/public/non_blocking_sync_common.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/non_blocking_sync_common.h" -namespace syncer { +namespace syncer_v2 { DataTypeState::DataTypeState() : next_client_id(0), initial_sync_done(false) { } diff --git a/sync/internal_api/public/non_blocking_sync_common.h b/sync/internal_api/public/non_blocking_sync_common.h index b53e6a6..faa9016 100644 --- a/sync/internal_api/public/non_blocking_sync_common.h +++ b/sync/internal_api/public/non_blocking_sync_common.h @@ -12,7 +12,7 @@ #include "sync/base/sync_export.h" #include "sync/protocol/sync.pb.h" -namespace syncer { +namespace syncer_v2 { static const int64 kUncommittedVersion = -1; diff --git a/sync/internal_api/public/sync_context.h b/sync/internal_api/public/sync_context.h index 12598cd..98740e1 100644 --- a/sync/internal_api/public/sync_context.h +++ b/sync/internal_api/public/sync_context.h @@ -13,9 +13,10 @@ #include "sync/internal_api/public/non_blocking_sync_common.h" namespace syncer { - class ModelTypeSyncProxyImpl; +} +namespace syncer_v2 { // An interface of the core parts of sync. // // In theory, this is the component that provides off-thread sync types with @@ -35,9 +36,9 @@ class SYNC_EXPORT_PRIVATE SyncContext { virtual void ConnectSyncTypeToWorker( syncer::ModelType type, const DataTypeState& data_type_state, - const syncer::UpdateResponseDataList& saved_pending_updates, + const UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& datatype_task_runner, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) = 0; + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) = 0; // Disconnects the syncer from the model and stops syncing the type. // @@ -48,7 +49,7 @@ class SYNC_EXPORT_PRIVATE SyncContext { // This is the sync thread's chance to clear state associated with the type. // It also causes the syncer to stop requesting updates for this type, and to // abort any in-progress commit requests. - virtual void DisconnectSyncWorker(ModelType type) = 0; + virtual void DisconnectSyncWorker(syncer::ModelType type) = 0; }; } // namespace syncer diff --git a/sync/internal_api/public/sync_context_proxy.h b/sync/internal_api/public/sync_context_proxy.h index 230a42a..94c7bc3 100644 --- a/sync/internal_api/public/sync_context_proxy.h +++ b/sync/internal_api/public/sync_context_proxy.h @@ -10,9 +10,10 @@ #include "sync/internal_api/public/non_blocking_sync_common.h" namespace syncer { - class ModelTypeSyncProxyImpl; -struct DataTypeState; +} + +namespace syncer_v2 { // Interface for the datatype integration logic from non-sync threads. // @@ -29,7 +30,7 @@ class SYNC_EXPORT_PRIVATE SyncContextProxy { syncer::ModelType type, const DataTypeState& data_type_state, const UpdateResponseDataList& saved_pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) = 0; + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) = 0; // Tells the syncer that we're no longer interested in syncing this type. // diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index da6069f..9a841f4e 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -51,7 +51,6 @@ class InternalComponentsFactory; class JsBackend; class JsEventHandler; class ProtocolEvent; -class SyncContextProxy; class SyncEncryptionHandler; class SyncScheduler; class TypeDebugInfoObserver; @@ -364,7 +363,7 @@ class SYNC_EXPORT SyncManager { virtual UserShare* GetUserShare() = 0; // Returns an instance of the main interface for non-blocking sync types. - virtual syncer::SyncContextProxy* GetSyncContextProxy() = 0; + virtual syncer_v2::SyncContextProxy* GetSyncContextProxy() = 0; // Returns the cache_guid of the currently open database. // Requires that the SyncManager be initialized. diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h index ebadf29..7945360 100644 --- a/sync/internal_api/public/test/fake_sync_manager.h +++ b/sync/internal_api/public/test/fake_sync_manager.h @@ -99,7 +99,7 @@ class FakeSyncManager : public SyncManager { void SaveChanges() override; void ShutdownOnSyncThread(ShutdownReason reason) override; UserShare* GetUserShare() override; - syncer::SyncContextProxy* GetSyncContextProxy() override; + syncer_v2::SyncContextProxy* GetSyncContextProxy() override; const std::string cache_guid() override; bool ReceivedExperiment(Experiments* experiments) override; bool HasUnsyncedItems() override; @@ -147,7 +147,7 @@ class FakeSyncManager : public SyncManager { TestUserShare test_user_share_; - NullSyncContextProxy null_sync_context_proxy_; + syncer_v2::NullSyncContextProxy null_sync_context_proxy_; DISALLOW_COPY_AND_ASSIGN(FakeSyncManager); }; diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h index 3a6a726..c654619 100644 --- a/sync/internal_api/public/test/null_sync_context_proxy.h +++ b/sync/internal_api/public/test/null_sync_context_proxy.h @@ -10,9 +10,10 @@ #include "sync/internal_api/public/sync_context_proxy.h" namespace syncer { - class ModelTypeSyncProxyImpl; +} +namespace syncer_v2 { // A non-functional implementation of SyncContextProxy. // // It supports Clone(), but not much else. Useful for testing. @@ -21,11 +22,11 @@ class NullSyncContextProxy : public SyncContextProxy { NullSyncContextProxy(); ~NullSyncContextProxy() override; - void ConnectTypeToSync( - syncer::ModelType type, - const DataTypeState& data_type_state, - const UpdateResponseDataList& saved_pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) override; + void ConnectTypeToSync(syncer::ModelType type, + const DataTypeState& data_type_state, + const UpdateResponseDataList& saved_pending_updates, + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& + type_sync_proxy) override; void Disconnect(syncer::ModelType type) override; scoped_ptr<SyncContextProxy> Clone() const override; }; diff --git a/sync/internal_api/sync_context.cc b/sync/internal_api/sync_context.cc index d5253b4..ba709fa 100644 --- a/sync/internal_api/sync_context.cc +++ b/sync/internal_api/sync_context.cc @@ -4,9 +4,7 @@ #include "sync/internal_api/public/sync_context.h" -#include "sync/engine/model_type_sync_worker_impl.h" - -namespace syncer { +namespace syncer_v2 { SyncContext::SyncContext() { } diff --git a/sync/internal_api/sync_context_proxy.cc b/sync/internal_api/sync_context_proxy.cc index 53c2bd3..e3125fe 100644 --- a/sync/internal_api/sync_context_proxy.cc +++ b/sync/internal_api/sync_context_proxy.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/sync_context_proxy.h" -namespace syncer { +namespace syncer_v2 { SyncContextProxy::SyncContextProxy() { } diff --git a/sync/internal_api/sync_context_proxy_impl.cc b/sync/internal_api/sync_context_proxy_impl.cc index ee17c72..0122254 100644 --- a/sync/internal_api/sync_context_proxy_impl.cc +++ b/sync/internal_api/sync_context_proxy_impl.cc @@ -11,7 +11,7 @@ #include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/internal_api/public/sync_context.h" -namespace syncer { +namespace syncer_v2 { SyncContextProxyImpl::SyncContextProxyImpl( const scoped_refptr<base::SequencedTaskRunner>& sync_task_runner, @@ -23,10 +23,10 @@ SyncContextProxyImpl::~SyncContextProxyImpl() { } void SyncContextProxyImpl::ConnectTypeToSync( - ModelType type, + syncer::ModelType type, const DataTypeState& data_type_state, const UpdateResponseDataList& saved_pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) { + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) { VLOG(1) << "ConnectTypeToSync: " << ModelTypeToString(type); sync_task_runner_->PostTask(FROM_HERE, base::Bind(&SyncContext::ConnectSyncTypeToWorker, @@ -38,7 +38,7 @@ void SyncContextProxyImpl::ConnectTypeToSync( type_sync_proxy)); } -void SyncContextProxyImpl::Disconnect(ModelType type) { +void SyncContextProxyImpl::Disconnect(syncer::ModelType type) { sync_task_runner_->PostTask( FROM_HERE, base::Bind(&SyncContext::DisconnectSyncWorker, sync_context_, type)); diff --git a/sync/internal_api/sync_context_proxy_impl.h b/sync/internal_api/sync_context_proxy_impl.h index 2bd6ba6..0a835ef 100644 --- a/sync/internal_api/sync_context_proxy_impl.h +++ b/sync/internal_api/sync_context_proxy_impl.h @@ -13,9 +13,12 @@ #include "sync/internal_api/public/sync_context_proxy.h" namespace syncer { +class ModelTypeSyncProxyImpl; +} + +namespace syncer_v2 { class SyncContext; -class ModelTypeSyncProxyImpl; struct DataTypeState; // Encapsulates a reference to the sync context and the thread it's running on. @@ -37,11 +40,11 @@ class SYNC_EXPORT_PRIVATE SyncContextProxyImpl : public SyncContextProxy { // unable to distinguish a slow success from failure. // // Must be called from the thread where the data type lives. - void ConnectTypeToSync( - syncer::ModelType type, - const DataTypeState& data_type_state, - const UpdateResponseDataList& pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& sync_proxy_impl) override; + void ConnectTypeToSync(syncer::ModelType type, + const DataTypeState& data_type_state, + const UpdateResponseDataList& pending_updates, + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& + sync_proxy_impl) override; // Disables syncing for the given type on the sync thread. void Disconnect(syncer::ModelType type) override; diff --git a/sync/internal_api/sync_context_proxy_impl_unittest.cc b/sync/internal_api/sync_context_proxy_impl_unittest.cc index 1ab1298..aa61eb4 100644 --- a/sync/internal_api/sync_context_proxy_impl_unittest.cc +++ b/sync/internal_api/sync_context_proxy_impl_unittest.cc @@ -15,7 +15,7 @@ #include "sync/test/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" -namespace syncer { +namespace syncer_v2 { class SyncContextProxyImplTest : public ::testing::Test { public: @@ -25,7 +25,7 @@ class SyncContextProxyImplTest : public ::testing::Test { void SetUp() override { dir_maker_.SetUp(); - registry_.reset(new ModelTypeRegistry( + registry_.reset(new syncer::ModelTypeRegistry( workers_, dir_maker_.directory(), &nudge_handler_)); context_proxy_.reset( new SyncContextProxyImpl(sync_task_runner_, registry_->AsWeakPtr())); @@ -48,17 +48,17 @@ class SyncContextProxyImplTest : public ::testing::Test { scoped_refptr<base::SequencedTaskRunner> sync_task_runner_; scoped_refptr<base::SequencedTaskRunner> type_task_runner_; - std::vector<scoped_refptr<ModelSafeWorker> > workers_; - TestDirectorySetterUpper dir_maker_; - MockNudgeHandler nudge_handler_; - scoped_ptr<ModelTypeRegistry> registry_; + std::vector<scoped_refptr<syncer::ModelSafeWorker>> workers_; + syncer::TestDirectorySetterUpper dir_maker_; + syncer::MockNudgeHandler nudge_handler_; + scoped_ptr<syncer::ModelTypeRegistry> registry_; scoped_ptr<SyncContextProxyImpl> context_proxy_; }; // Try to connect a type to a SyncContext that has already shut down. TEST_F(SyncContextProxyImplTest, FailToConnect1) { - ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); + syncer::ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); DisableSync(); themes_sync_proxy.Enable(GetProxy()); @@ -69,7 +69,7 @@ TEST_F(SyncContextProxyImplTest, FailToConnect1) { // Try to connect a type to a SyncContext as it shuts down. TEST_F(SyncContextProxyImplTest, FailToConnect2) { - ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); + syncer::ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); themes_sync_proxy.Enable(GetProxy()); DisableSync(); @@ -80,8 +80,8 @@ TEST_F(SyncContextProxyImplTest, FailToConnect2) { // Tests the case where the type's sync proxy shuts down first. TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) { - scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy( - new ModelTypeSyncProxyImpl(syncer::THEMES)); + scoped_ptr<syncer::ModelTypeSyncProxyImpl> themes_sync_proxy( + new syncer::ModelTypeSyncProxyImpl(syncer::THEMES)); themes_sync_proxy->Enable(GetProxy()); base::RunLoop run_loop_; @@ -93,8 +93,8 @@ TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) { // Tests the case where the sync thread shuts down first. TEST_F(SyncContextProxyImplTest, SyncDisconnectsFirst) { - scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy( - new ModelTypeSyncProxyImpl(syncer::THEMES)); + scoped_ptr<syncer::ModelTypeSyncProxyImpl> themes_sync_proxy( + new syncer::ModelTypeSyncProxyImpl(syncer::THEMES)); themes_sync_proxy->Enable(GetProxy()); base::RunLoop run_loop_; diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc index 67dd78f..15d2d85 100644 --- a/sync/internal_api/sync_manager_impl.cc +++ b/sync/internal_api/sync_manager_impl.cc @@ -313,11 +313,12 @@ void SyncManagerImpl::Init(InitArgs* args) { // Bind the SyncContext WeakPtr to this thread. This helps us crash earlier // if the pointer is misused in debug mode. - base::WeakPtr<SyncContext> weak_core = model_type_registry_->AsWeakPtr(); + base::WeakPtr<syncer_v2::SyncContext> weak_core = + model_type_registry_->AsWeakPtr(); weak_core.get(); - sync_context_proxy_.reset( - new SyncContextProxyImpl(base::ThreadTaskRunnerHandle::Get(), weak_core)); + sync_context_proxy_.reset(new syncer_v2::SyncContextProxyImpl( + base::ThreadTaskRunnerHandle::Get(), weak_core)); // Build a SyncSessionContext and store the worker in it. DVLOG(1) << "Sync is bringing up SyncSessionContext."; @@ -940,7 +941,7 @@ UserShare* SyncManagerImpl::GetUserShare() { return &share_; } -syncer::SyncContextProxy* SyncManagerImpl::GetSyncContextProxy() { +syncer_v2::SyncContextProxy* SyncManagerImpl::GetSyncContextProxy() { DCHECK(initialized_); return sync_context_proxy_.get(); } diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h index 5d957d3..d0b86f3 100644 --- a/sync/internal_api/sync_manager_impl.h +++ b/sync/internal_api/sync_manager_impl.h @@ -31,11 +31,14 @@ class GURL; +namespace syncer_v2 { +class SyncContext; +} + namespace syncer { class ModelTypeRegistry; class SyncAPIServerConnectionManager; -class SyncContext; class TypeDebugInfoObserver; class WriteNode; class WriteTransaction; @@ -94,7 +97,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl void SaveChanges() override; void ShutdownOnSyncThread(ShutdownReason reason) override; UserShare* GetUserShare() override; - syncer::SyncContextProxy* GetSyncContextProxy() override; + syncer_v2::SyncContextProxy* GetSyncContextProxy() override; const std::string cache_guid() override; bool ReceivedExperiment(Experiments* experiments) override; bool HasUnsyncedItems() override; @@ -287,8 +290,8 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl scoped_ptr<ModelTypeRegistry> model_type_registry_; // The main interface for non-blocking sync types and a thread-safe wrapper. - scoped_ptr<SyncContext> sync_context_; - scoped_ptr<SyncContextProxy> sync_context_proxy_; + scoped_ptr<syncer_v2::SyncContext> sync_context_; + scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_; // A container of various bits of information used by the SyncScheduler to // create SyncSessions. Must outlive the SyncScheduler. diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index 07049f1..55d2e8d 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -213,7 +213,7 @@ void SyncRollbackManagerBase::NotifyInitializationFailure() { false, ModelTypeSet())); } -syncer::SyncContextProxy* SyncRollbackManagerBase::GetSyncContextProxy() { +syncer_v2::SyncContextProxy* SyncRollbackManagerBase::GetSyncContextProxy() { return NULL; } diff --git a/sync/internal_api/sync_rollback_manager_base.h b/sync/internal_api/sync_rollback_manager_base.h index 4c3fe8b..ef09c4e 100644 --- a/sync/internal_api/sync_rollback_manager_base.h +++ b/sync/internal_api/sync_rollback_manager_base.h @@ -66,7 +66,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : bool HasUnsyncedItems() override; SyncEncryptionHandler* GetEncryptionHandler() override; void RefreshTypes(ModelTypeSet types) override; - SyncContextProxy* GetSyncContextProxy() override; + syncer_v2::SyncContextProxy* GetSyncContextProxy() override; ScopedVector<ProtocolEvent> GetBufferedProtocolEvents() override; scoped_ptr<base::ListValue> GetAllNodesForType( syncer::ModelType type) override; diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc index 6f9091e..5986c49 100644 --- a/sync/internal_api/test/fake_sync_manager.cc +++ b/sync/internal_api/test/fake_sync_manager.cc @@ -195,7 +195,7 @@ UserShare* FakeSyncManager::GetUserShare() { return test_user_share_.user_share(); } -syncer::SyncContextProxy* FakeSyncManager::GetSyncContextProxy() { +syncer_v2::SyncContextProxy* FakeSyncManager::GetSyncContextProxy() { return &null_sync_context_proxy_; } diff --git a/sync/internal_api/test/null_sync_context_proxy.cc b/sync/internal_api/test/null_sync_context_proxy.cc index 2fc8bbf..5c272e5 100644 --- a/sync/internal_api/test/null_sync_context_proxy.cc +++ b/sync/internal_api/test/null_sync_context_proxy.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/test/null_sync_context_proxy.h" -namespace syncer { +namespace syncer_v2 { NullSyncContextProxy::NullSyncContextProxy() { } @@ -16,7 +16,7 @@ void NullSyncContextProxy::ConnectTypeToSync( syncer::ModelType type, const DataTypeState& data_type_state, const UpdateResponseDataList& saved_pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) { + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) { NOTREACHED() << "NullSyncContextProxy is not meant to be used"; } diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc index 0bd70b2..2f72a2f 100644 --- a/sync/sessions/model_type_registry.cc +++ b/sync/sessions/model_type_registry.cc @@ -28,11 +28,13 @@ class ModelTypeSyncProxyWrapper : public ModelTypeSyncProxy { const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner); ~ModelTypeSyncProxyWrapper() override; - void OnCommitCompleted(const DataTypeState& type_state, - const CommitResponseDataList& response_list) override; - void OnUpdateReceived(const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) override; + void OnCommitCompleted( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) override; + void OnUpdateReceived( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) override; private: base::WeakPtr<ModelTypeSyncProxyImpl> processor_; @@ -49,8 +51,8 @@ ModelTypeSyncProxyWrapper::~ModelTypeSyncProxyWrapper() { } void ModelTypeSyncProxyWrapper::OnCommitCompleted( - const DataTypeState& type_state, - const CommitResponseDataList& response_list) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) { processor_task_runner_->PostTask( FROM_HERE, base::Bind(&ModelTypeSyncProxyImpl::OnCommitCompleted, @@ -60,9 +62,9 @@ void ModelTypeSyncProxyWrapper::OnCommitCompleted( } void ModelTypeSyncProxyWrapper::OnUpdateReceived( - const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) { processor_task_runner_->PostTask( FROM_HERE, base::Bind(&ModelTypeSyncProxyImpl::OnUpdateReceived, @@ -79,7 +81,7 @@ class ModelTypeSyncWorkerWrapper : public ModelTypeSyncWorker { const scoped_refptr<base::SequencedTaskRunner>& sync_thread); ~ModelTypeSyncWorkerWrapper() override; - void EnqueueForCommit(const CommitRequestDataList& list) override; + void EnqueueForCommit(const syncer_v2::CommitRequestDataList& list) override; private: base::WeakPtr<ModelTypeSyncWorkerImpl> worker_; @@ -96,7 +98,7 @@ ModelTypeSyncWorkerWrapper::~ModelTypeSyncWorkerWrapper() { } void ModelTypeSyncWorkerWrapper::EnqueueForCommit( - const CommitRequestDataList& list) { + const syncer_v2::CommitRequestDataList& list) { sync_thread_->PostTask( FROM_HERE, base::Bind(&ModelTypeSyncWorkerImpl::EnqueueForCommit, worker_, list)); @@ -187,8 +189,8 @@ void ModelTypeRegistry::SetEnabledDirectoryTypes( void ModelTypeRegistry::ConnectSyncTypeToWorker( ModelType type, - const DataTypeState& data_type_state, - const UpdateResponseDataList& saved_pending_updates, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy_impl) { DVLOG(1) << "Enabling an off-thread sync type: " << ModelTypeToString(type); @@ -297,7 +299,7 @@ void ModelTypeRegistry::RequestEmitDebugInfo() { } } -base::WeakPtr<SyncContext> ModelTypeRegistry::AsWeakPtr() { +base::WeakPtr<syncer_v2::SyncContext> ModelTypeRegistry::AsWeakPtr() { return weak_ptr_factory_.GetWeakPtr(); } diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h index 53c0d99..ca3ee80 100644 --- a/sync/sessions/model_type_registry.h +++ b/sync/sessions/model_type_registry.h @@ -20,6 +20,10 @@ #include "sync/internal_api/public/sync_context.h" #include "sync/internal_api/public/sync_encryption_handler.h" +namespace syncer_v2 { +struct DataTypeState; +} + namespace syncer { namespace syncable { @@ -41,7 +45,7 @@ typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*> // Keeps track of the sets of active update handlers and commit contributors. class SYNC_EXPORT_PRIVATE ModelTypeRegistry - : public SyncContext, + : public syncer_v2::SyncContext, public SyncEncryptionHandler::Observer { public: // Constructs a ModelTypeRegistry that supports directory types. @@ -59,8 +63,8 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry // Expects that the proxy's ModelType is not currently enabled. void ConnectSyncTypeToWorker( syncer::ModelType type, - const DataTypeState& data_type_state, - const syncer::UpdateResponseDataList& saved_pending_updates, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) override; diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc index 47be479..4390181 100644 --- a/sync/sessions/model_type_registry_unittest.cc +++ b/sync/sessions/model_type_registry_unittest.cc @@ -25,8 +25,8 @@ class ModelTypeRegistryTest : public ::testing::Test { ModelTypeRegistry* registry(); - static DataTypeState MakeInitialDataTypeState(ModelType type) { - DataTypeState state; + static syncer_v2::DataTypeState MakeInitialDataTypeState(ModelType type) { + syncer_v2::DataTypeState state; state.progress_marker.set_data_type_id( GetSpecificsFieldNumberFromModelType(type)); state.next_client_id = 0; @@ -152,19 +152,17 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { EXPECT_TRUE(registry()->GetEnabledTypes().Empty()); - registry()->ConnectSyncTypeToWorker(syncer::THEMES, - MakeInitialDataTypeState(THEMES), - UpdateResponseDataList(), - task_runner, - themes_sync_proxy.AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::THEMES, MakeInitialDataTypeState(THEMES), + syncer_v2::UpdateResponseDataList(), task_runner, + themes_sync_proxy.AsWeakPtrForUI()); EXPECT_TRUE(registry()->GetEnabledTypes().Equals( ModelTypeSet(syncer::THEMES))); - registry()->ConnectSyncTypeToWorker(syncer::SESSIONS, - MakeInitialDataTypeState(SESSIONS), - UpdateResponseDataList(), - task_runner, - sessions_sync_proxy.AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS), + syncer_v2::UpdateResponseDataList(), task_runner, + sessions_sync_proxy.AsWeakPtrForUI()); EXPECT_TRUE(registry()->GetEnabledTypes().Equals( ModelTypeSet(syncer::THEMES, syncer::SESSIONS))); @@ -192,11 +190,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { EXPECT_TRUE(registry()->GetEnabledTypes().Empty()); // Add the themes non-blocking type. - registry()->ConnectSyncTypeToWorker(syncer::THEMES, - MakeInitialDataTypeState(THEMES), - UpdateResponseDataList(), - task_runner, - themes_sync_proxy.AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::THEMES, MakeInitialDataTypeState(THEMES), + syncer_v2::UpdateResponseDataList(), task_runner, + themes_sync_proxy.AsWeakPtrForUI()); current_types.Put(syncer::THEMES); EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types)); @@ -206,11 +203,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types)); // Add sessions non-blocking type. - registry()->ConnectSyncTypeToWorker(syncer::SESSIONS, - MakeInitialDataTypeState(SESSIONS), - UpdateResponseDataList(), - task_runner, - sessions_sync_proxy.AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS), + syncer_v2::UpdateResponseDataList(), task_runner, + sessions_sync_proxy.AsWeakPtrForUI()); current_types.Put(syncer::SESSIONS); EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types)); @@ -237,16 +233,14 @@ TEST_F(ModelTypeRegistryTest, DeletionOrdering) { EXPECT_TRUE(registry()->GetEnabledTypes().Empty()); - registry()->ConnectSyncTypeToWorker(syncer::THEMES, - MakeInitialDataTypeState(THEMES), - UpdateResponseDataList(), - task_runner, - themes_sync_proxy->AsWeakPtrForUI()); - registry()->ConnectSyncTypeToWorker(syncer::SESSIONS, - MakeInitialDataTypeState(SESSIONS), - UpdateResponseDataList(), - task_runner, - sessions_sync_proxy->AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::THEMES, MakeInitialDataTypeState(THEMES), + syncer_v2::UpdateResponseDataList(), task_runner, + themes_sync_proxy->AsWeakPtrForUI()); + registry()->ConnectSyncTypeToWorker( + syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS), + syncer_v2::UpdateResponseDataList(), task_runner, + sessions_sync_proxy->AsWeakPtrForUI()); EXPECT_TRUE(registry()->GetEnabledTypes().Equals( ModelTypeSet(syncer::THEMES, syncer::SESSIONS))); diff --git a/sync/test/engine/injectable_sync_context_proxy.cc b/sync/test/engine/injectable_sync_context_proxy.cc index 310a198..8626ba5 100644 --- a/sync/test/engine/injectable_sync_context_proxy.cc +++ b/sync/test/engine/injectable_sync_context_proxy.cc @@ -19,8 +19,8 @@ InjectableSyncContextProxy::~InjectableSyncContextProxy() { void InjectableSyncContextProxy::ConnectTypeToSync( syncer::ModelType type, - const DataTypeState& data_type_state, - const UpdateResponseDataList& response_list, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& response_list, const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) { // This class is allowed to participate in only one connection. DCHECK(!is_worker_connected_); @@ -38,9 +38,11 @@ void InjectableSyncContextProxy::Disconnect(syncer::ModelType type) { worker_ = NULL; } -scoped_ptr<SyncContextProxy> InjectableSyncContextProxy::Clone() const { +scoped_ptr<syncer_v2::SyncContextProxy> InjectableSyncContextProxy::Clone() + const { // This confuses ownership. We trust that our callers are well-behaved. - return scoped_ptr<SyncContextProxy>(new InjectableSyncContextProxy(worker_)); + return scoped_ptr<syncer_v2::SyncContextProxy>( + new InjectableSyncContextProxy(worker_)); } ModelTypeSyncWorker* InjectableSyncContextProxy::GetWorker() { diff --git a/sync/test/engine/injectable_sync_context_proxy.h b/sync/test/engine/injectable_sync_context_proxy.h index 3b97820..ffae68d 100644 --- a/sync/test/engine/injectable_sync_context_proxy.h +++ b/sync/test/engine/injectable_sync_context_proxy.h @@ -11,24 +11,24 @@ namespace syncer { -struct DataTypeState; class ModelTypeSyncProxyImpl; class ModelTypeSyncWorker; // A SyncContextProxy implementation that, when a connection request is made, // initalizes a connection to a previously injected ModelTypeSyncProxyImpl. -class InjectableSyncContextProxy : public syncer::SyncContextProxy { +class InjectableSyncContextProxy : public syncer_v2::SyncContextProxy { public: explicit InjectableSyncContextProxy(ModelTypeSyncWorker* worker); ~InjectableSyncContextProxy() override; - void ConnectTypeToSync(syncer::ModelType type, - const DataTypeState& data_type_state, - const UpdateResponseDataList& pending_updates, - const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& - type_sync_proxy) override; - void Disconnect(syncer::ModelType type) override; - scoped_ptr<SyncContextProxy> Clone() const override; + void ConnectTypeToSync( + ModelType type, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& pending_updates, + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) + override; + void Disconnect(ModelType type) override; + scoped_ptr<syncer_v2::SyncContextProxy> Clone() const override; ModelTypeSyncWorker* GetWorker(); diff --git a/sync/test/engine/mock_model_type_sync_proxy.cc b/sync/test/engine/mock_model_type_sync_proxy.cc index 423a37a..bd6a79d 100644 --- a/sync/test/engine/mock_model_type_sync_proxy.cc +++ b/sync/test/engine/mock_model_type_sync_proxy.cc @@ -15,8 +15,8 @@ MockModelTypeSyncProxy::~MockModelTypeSyncProxy() { } void MockModelTypeSyncProxy::OnCommitCompleted( - const DataTypeState& type_state, - const CommitResponseDataList& response_list) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) { base::Closure task = base::Bind(&MockModelTypeSyncProxy::OnCommitCompletedImpl, base::Unretained(this), @@ -28,9 +28,9 @@ void MockModelTypeSyncProxy::OnCommitCompleted( } void MockModelTypeSyncProxy::OnUpdateReceived( - const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) { base::Closure task = base::Bind(&MockModelTypeSyncProxy::OnUpdateReceivedImpl, base::Unretained(this), type_state, @@ -54,12 +54,12 @@ void MockModelTypeSyncProxy::RunQueuedTasks() { pending_tasks_.clear(); } -CommitRequestData MockModelTypeSyncProxy::CommitRequest( +syncer_v2::CommitRequestData MockModelTypeSyncProxy::CommitRequest( const std::string& tag_hash, const sync_pb::EntitySpecifics& specifics) { const int64 base_version = GetBaseVersion(tag_hash); - CommitRequestData data; + syncer_v2::CommitRequestData data; if (HasServerAssignedId(tag_hash)) { data.id = GetServerAssignedId(tag_hash); @@ -80,10 +80,10 @@ CommitRequestData MockModelTypeSyncProxy::CommitRequest( return data; } -CommitRequestData MockModelTypeSyncProxy::DeleteRequest( +syncer_v2::CommitRequestData MockModelTypeSyncProxy::DeleteRequest( const std::string& tag_hash) { const int64 base_version = GetBaseVersion(tag_hash); - CommitRequestData data; + syncer_v2::CommitRequestData data; if (HasServerAssignedId(tag_hash)) { data.id = GetServerAssignedId(tag_hash); @@ -107,19 +107,20 @@ size_t MockModelTypeSyncProxy::GetNumUpdateResponses() const { return received_update_responses_.size(); } -UpdateResponseDataList MockModelTypeSyncProxy::GetNthUpdateResponse( +syncer_v2::UpdateResponseDataList MockModelTypeSyncProxy::GetNthUpdateResponse( size_t n) const { DCHECK_LT(n, GetNumUpdateResponses()); return received_update_responses_[n]; } -UpdateResponseDataList MockModelTypeSyncProxy::GetNthPendingUpdates( +syncer_v2::UpdateResponseDataList MockModelTypeSyncProxy::GetNthPendingUpdates( size_t n) const { DCHECK_LT(n, GetNumUpdateResponses()); return received_pending_updates_[n]; } -DataTypeState MockModelTypeSyncProxy::GetNthTypeStateReceivedInUpdateResponse( +syncer_v2::DataTypeState +MockModelTypeSyncProxy::GetNthTypeStateReceivedInUpdateResponse( size_t n) const { DCHECK_LT(n, GetNumUpdateResponses()); return type_states_received_on_update_[n]; @@ -129,13 +130,14 @@ size_t MockModelTypeSyncProxy::GetNumCommitResponses() const { return received_commit_responses_.size(); } -CommitResponseDataList MockModelTypeSyncProxy::GetNthCommitResponse( +syncer_v2::CommitResponseDataList MockModelTypeSyncProxy::GetNthCommitResponse( size_t n) const { DCHECK_LT(n, GetNumCommitResponses()); return received_commit_responses_[n]; } -DataTypeState MockModelTypeSyncProxy::GetNthTypeStateReceivedInCommitResponse( +syncer_v2::DataTypeState +MockModelTypeSyncProxy::GetNthTypeStateReceivedInCommitResponse( size_t n) const { DCHECK_LT(n, GetNumCommitResponses()); return type_states_received_on_commit_[n]; @@ -143,42 +145,42 @@ DataTypeState MockModelTypeSyncProxy::GetNthTypeStateReceivedInCommitResponse( bool MockModelTypeSyncProxy::HasUpdateResponse( const std::string& tag_hash) const { - std::map<const std::string, UpdateResponseData>::const_iterator it = - update_response_items_.find(tag_hash); + std::map<const std::string, syncer_v2::UpdateResponseData>::const_iterator + it = update_response_items_.find(tag_hash); return it != update_response_items_.end(); } -UpdateResponseData MockModelTypeSyncProxy::GetUpdateResponse( +syncer_v2::UpdateResponseData MockModelTypeSyncProxy::GetUpdateResponse( const std::string& tag_hash) const { DCHECK(HasUpdateResponse(tag_hash)); - std::map<const std::string, UpdateResponseData>::const_iterator it = - update_response_items_.find(tag_hash); + std::map<const std::string, syncer_v2::UpdateResponseData>::const_iterator + it = update_response_items_.find(tag_hash); return it->second; } bool MockModelTypeSyncProxy::HasCommitResponse( const std::string& tag_hash) const { - std::map<const std::string, CommitResponseData>::const_iterator it = - commit_response_items_.find(tag_hash); + std::map<const std::string, syncer_v2::CommitResponseData>::const_iterator + it = commit_response_items_.find(tag_hash); return it != commit_response_items_.end(); } -CommitResponseData MockModelTypeSyncProxy::GetCommitResponse( +syncer_v2::CommitResponseData MockModelTypeSyncProxy::GetCommitResponse( const std::string& tag_hash) const { DCHECK(HasCommitResponse(tag_hash)); - std::map<const std::string, CommitResponseData>::const_iterator it = - commit_response_items_.find(tag_hash); + std::map<const std::string, syncer_v2::CommitResponseData>::const_iterator + it = commit_response_items_.find(tag_hash); return it->second; } void MockModelTypeSyncProxy::OnCommitCompletedImpl( - const DataTypeState& type_state, - const CommitResponseDataList& response_list) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) { received_commit_responses_.push_back(response_list); type_states_received_on_commit_.push_back(type_state); - for (CommitResponseDataList::const_iterator it = response_list.begin(); - it != response_list.end(); - ++it) { + for (syncer_v2::CommitResponseDataList::const_iterator it = + response_list.begin(); + it != response_list.end(); ++it) { commit_response_items_.insert(std::make_pair(it->client_tag_hash, *it)); // Server wins. Set the model's base version. @@ -188,15 +190,15 @@ void MockModelTypeSyncProxy::OnCommitCompletedImpl( } void MockModelTypeSyncProxy::OnUpdateReceivedImpl( - const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) { + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) { received_update_responses_.push_back(response_list); received_pending_updates_.push_back(pending_updates); type_states_received_on_update_.push_back(type_state); - for (UpdateResponseDataList::const_iterator it = response_list.begin(); - it != response_list.end(); - ++it) { + for (syncer_v2::UpdateResponseDataList::const_iterator it = + response_list.begin(); + it != response_list.end(); ++it) { update_response_items_.insert(std::make_pair(it->client_tag_hash, *it)); // Server wins. Set the model's base version. @@ -232,7 +234,7 @@ int64 MockModelTypeSyncProxy::GetBaseVersion( std::map<const std::string, int64>::const_iterator it = base_versions_.find(tag_hash); if (it == base_versions_.end()) { - return kUncommittedVersion; + return syncer_v2::kUncommittedVersion; } else { return it->second; } diff --git a/sync/test/engine/mock_model_type_sync_proxy.h b/sync/test/engine/mock_model_type_sync_proxy.h index 338a5ae..83fe98d 100644 --- a/sync/test/engine/mock_model_type_sync_proxy.h +++ b/sync/test/engine/mock_model_type_sync_proxy.h @@ -31,11 +31,13 @@ class MockModelTypeSyncProxy : public ModelTypeSyncProxy { ~MockModelTypeSyncProxy() override; // Implementation of ModelTypeSyncProxy. - void OnCommitCompleted(const DataTypeState& type_state, - const CommitResponseDataList& response_list) override; - void OnUpdateReceived(const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates) override; + void OnCommitCompleted( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list) override; + void OnUpdateReceived( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates) override; // By default, this object behaves as if all messages are processed // immediately. Sometimes it is useful to defer work until later, as might @@ -55,46 +57,53 @@ class MockModelTypeSyncProxy : public ModelTypeSyncProxy { // directly to its attached ModelTypeSyncWorker. These methods // return the value to the caller so the test framework can handle them as it // sees fit. - CommitRequestData CommitRequest(const std::string& tag_hash, - const sync_pb::EntitySpecifics& specifics); - CommitRequestData DeleteRequest(const std::string& tag_hash); + syncer_v2::CommitRequestData CommitRequest( + const std::string& tag_hash, + const sync_pb::EntitySpecifics& specifics); + syncer_v2::CommitRequestData DeleteRequest(const std::string& tag_hash); // Getters to access the log of received update responses. // // Does not includes repsonses that are in pending tasks. size_t GetNumUpdateResponses() const; - UpdateResponseDataList GetNthUpdateResponse(size_t n) const; - UpdateResponseDataList GetNthPendingUpdates(size_t n) const; - DataTypeState GetNthTypeStateReceivedInUpdateResponse(size_t n) const; + syncer_v2::UpdateResponseDataList GetNthUpdateResponse(size_t n) const; + syncer_v2::UpdateResponseDataList GetNthPendingUpdates(size_t n) const; + syncer_v2::DataTypeState GetNthTypeStateReceivedInUpdateResponse( + size_t n) const; // Getters to access the log of received commit responses. // // Does not includes repsonses that are in pending tasks. size_t GetNumCommitResponses() const; - CommitResponseDataList GetNthCommitResponse(size_t n) const; - DataTypeState GetNthTypeStateReceivedInCommitResponse(size_t n) const; + syncer_v2::CommitResponseDataList GetNthCommitResponse(size_t n) const; + syncer_v2::DataTypeState GetNthTypeStateReceivedInCommitResponse( + size_t n) const; // Getters to access the lastest update response for a given tag_hash. bool HasUpdateResponse(const std::string& tag_hash) const; - UpdateResponseData GetUpdateResponse(const std::string& tag_hash) const; + syncer_v2::UpdateResponseData GetUpdateResponse( + const std::string& tag_hash) const; // Getters to access the lastest commit response for a given tag_hash. bool HasCommitResponse(const std::string& tag_hash) const; - CommitResponseData GetCommitResponse(const std::string& tag_hash) const; + syncer_v2::CommitResponseData GetCommitResponse( + const std::string& tag_hash) const; private: // Process a received commit response. // // Implemented as an Impl method so we can defer its execution in some cases. - void OnCommitCompletedImpl(const DataTypeState& type_state, - const CommitResponseDataList& response_list); + void OnCommitCompletedImpl( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::CommitResponseDataList& response_list); // Process a received update response. // // Implemented as an Impl method so we can defer its execution in some cases. - void OnUpdateReceivedImpl(const DataTypeState& type_state, - const UpdateResponseDataList& response_list, - const UpdateResponseDataList& pending_updates); + void OnUpdateReceivedImpl( + const syncer_v2::DataTypeState& type_state, + const syncer_v2::UpdateResponseDataList& response_list, + const syncer_v2::UpdateResponseDataList& pending_updates); // Getter and setter for per-item sequence number tracking. int64 GetCurrentSequenceNumber(const std::string& tag_hash) const; @@ -115,15 +124,17 @@ class MockModelTypeSyncProxy : public ModelTypeSyncProxy { std::vector<base::Closure> pending_tasks_; // A log of messages received by this object. - std::vector<CommitResponseDataList> received_commit_responses_; - std::vector<UpdateResponseDataList> received_update_responses_; - std::vector<UpdateResponseDataList> received_pending_updates_; - std::vector<DataTypeState> type_states_received_on_update_; - std::vector<DataTypeState> type_states_received_on_commit_; + std::vector<syncer_v2::CommitResponseDataList> received_commit_responses_; + std::vector<syncer_v2::UpdateResponseDataList> received_update_responses_; + std::vector<syncer_v2::UpdateResponseDataList> received_pending_updates_; + std::vector<syncer_v2::DataTypeState> type_states_received_on_update_; + std::vector<syncer_v2::DataTypeState> type_states_received_on_commit_; // Latest responses received, indexed by tag_hash. - std::map<const std::string, CommitResponseData> commit_response_items_; - std::map<const std::string, UpdateResponseData> update_response_items_; + std::map<const std::string, syncer_v2::CommitResponseData> + commit_response_items_; + std::map<const std::string, syncer_v2::UpdateResponseData> + update_response_items_; // The per-item state maps. std::map<const std::string, int64> sequence_numbers_; diff --git a/sync/test/engine/mock_model_type_sync_worker.cc b/sync/test/engine/mock_model_type_sync_worker.cc index 8b6b523..b628703 100644 --- a/sync/test/engine/mock_model_type_sync_worker.cc +++ b/sync/test/engine/mock_model_type_sync_worker.cc @@ -15,7 +15,7 @@ MockModelTypeSyncWorker::~MockModelTypeSyncWorker() { } void MockModelTypeSyncWorker::EnqueueForCommit( - const CommitRequestDataList& list) { + const syncer_v2::CommitRequestDataList& list) { commit_request_lists_.push_back(list); } @@ -23,8 +23,8 @@ size_t MockModelTypeSyncWorker::GetNumCommitRequestLists() const { return commit_request_lists_.size(); } -CommitRequestDataList MockModelTypeSyncWorker::GetNthCommitRequestList( - size_t n) const { +syncer_v2::CommitRequestDataList +MockModelTypeSyncWorker::GetNthCommitRequestList(size_t n) const { DCHECK_LT(n, GetNumCommitRequestLists()); return commit_request_lists_[n]; } @@ -33,13 +33,12 @@ bool MockModelTypeSyncWorker::HasCommitRequestForTagHash( const std::string& tag_hash) const { // Iterate backward through the sets of commit requests to find the most // recent one that applies to the specified tag_hash. - for (std::vector<CommitRequestDataList>::const_reverse_iterator lists_it = - commit_request_lists_.rbegin(); - lists_it != commit_request_lists_.rend(); - ++lists_it) { - for (CommitRequestDataList::const_iterator it = lists_it->begin(); - it != lists_it->end(); - ++it) { + for (std::vector<syncer_v2::CommitRequestDataList>::const_reverse_iterator + lists_it = commit_request_lists_.rbegin(); + lists_it != commit_request_lists_.rend(); ++lists_it) { + for (syncer_v2::CommitRequestDataList::const_iterator it = + lists_it->begin(); + it != lists_it->end(); ++it) { if (it->client_tag_hash == tag_hash) { return true; } @@ -49,17 +48,17 @@ bool MockModelTypeSyncWorker::HasCommitRequestForTagHash( return false; } -CommitRequestData MockModelTypeSyncWorker::GetLatestCommitRequestForTagHash( +syncer_v2::CommitRequestData +MockModelTypeSyncWorker::GetLatestCommitRequestForTagHash( const std::string& tag_hash) const { // Iterate backward through the sets of commit requests to find the most // recent one that applies to the specified tag_hash. - for (std::vector<CommitRequestDataList>::const_reverse_iterator lists_it = - commit_request_lists_.rbegin(); - lists_it != commit_request_lists_.rend(); - ++lists_it) { - for (CommitRequestDataList::const_iterator it = lists_it->begin(); - it != lists_it->end(); - ++it) { + for (std::vector<syncer_v2::CommitRequestDataList>::const_reverse_iterator + lists_it = commit_request_lists_.rbegin(); + lists_it != commit_request_lists_.rend(); ++lists_it) { + for (syncer_v2::CommitRequestDataList::const_iterator it = + lists_it->begin(); + it != lists_it->end(); ++it) { if (it->client_tag_hash == tag_hash) { return *it; } @@ -67,10 +66,10 @@ CommitRequestData MockModelTypeSyncWorker::GetLatestCommitRequestForTagHash( } NOTREACHED() << "Could not find commit for tag hash " << tag_hash << "."; - return CommitRequestData(); + return syncer_v2::CommitRequestData(); } -UpdateResponseData MockModelTypeSyncWorker::UpdateFromServer( +syncer_v2::UpdateResponseData MockModelTypeSyncWorker::UpdateFromServer( int64 version_offset, const std::string& tag_hash, const sync_pb::EntitySpecifics& specifics) { @@ -81,7 +80,7 @@ UpdateResponseData MockModelTypeSyncWorker::UpdateFromServer( SetServerVersion(tag_hash, version); } - UpdateResponseData data; + syncer_v2::UpdateResponseData data; data.id = GenerateId(tag_hash); data.client_tag_hash = tag_hash; data.response_version = version; @@ -99,7 +98,7 @@ UpdateResponseData MockModelTypeSyncWorker::UpdateFromServer( return data; } -UpdateResponseData MockModelTypeSyncWorker::TombstoneFromServer( +syncer_v2::UpdateResponseData MockModelTypeSyncWorker::TombstoneFromServer( int64 version_offset, const std::string& tag_hash) { int64 old_version = GetServerVersion(tag_hash); @@ -108,7 +107,7 @@ UpdateResponseData MockModelTypeSyncWorker::TombstoneFromServer( SetServerVersion(tag_hash, version); } - UpdateResponseData data; + syncer_v2::UpdateResponseData data; data.id = GenerateId(tag_hash); data.client_tag_hash = tag_hash; data.response_version = version; @@ -125,11 +124,11 @@ UpdateResponseData MockModelTypeSyncWorker::TombstoneFromServer( return data; } -CommitResponseData MockModelTypeSyncWorker::SuccessfulCommitResponse( - const CommitRequestData& request_data) { +syncer_v2::CommitResponseData MockModelTypeSyncWorker::SuccessfulCommitResponse( + const syncer_v2::CommitRequestData& request_data) { const std::string& client_tag_hash = request_data.client_tag_hash; - CommitResponseData response_data; + syncer_v2::CommitResponseData response_data; if (request_data.base_version == 0) { // Server assigns new ID to newly committed items. diff --git a/sync/test/engine/mock_model_type_sync_worker.h b/sync/test/engine/mock_model_type_sync_worker.h index 688cfc3..3f71d3a 100644 --- a/sync/test/engine/mock_model_type_sync_worker.h +++ b/sync/test/engine/mock_model_type_sync_worker.h @@ -24,13 +24,13 @@ class MockModelTypeSyncWorker : public ModelTypeSyncWorker { ~MockModelTypeSyncWorker() override; // Implementation of ModelTypeSyncWorker. - void EnqueueForCommit(const CommitRequestDataList& list) override; + void EnqueueForCommit(const syncer_v2::CommitRequestDataList& list) override; // Getters to inspect the requests sent to this object. size_t GetNumCommitRequestLists() const; - CommitRequestDataList GetNthCommitRequestList(size_t n) const; + syncer_v2::CommitRequestDataList GetNthCommitRequestList(size_t n) const; bool HasCommitRequestForTagHash(const std::string& tag_hash) const; - CommitRequestData GetLatestCommitRequestForTagHash( + syncer_v2::CommitRequestData GetLatestCommitRequestForTagHash( const std::string& tag_hash) const; // Functions to produce state as though it came from a real server and had @@ -42,20 +42,21 @@ class MockModelTypeSyncWorker : public ModelTypeSyncWorker { // The |version_offset| field can be used to emulate stale data (ie. versions // going backwards), reflections and redeliveries (ie. several instances of // the same version) or new updates. - UpdateResponseData UpdateFromServer( + syncer_v2::UpdateResponseData UpdateFromServer( int64 version_offset, const std::string& tag_hash, const sync_pb::EntitySpecifics& specifics); // Returns an UpdateResponseData representing a tombstone update from the // server. Updates server state accordingly. - UpdateResponseData TombstoneFromServer(int64 version_offset, - const std::string& tag_hash); + syncer_v2::UpdateResponseData TombstoneFromServer( + int64 version_offset, + const std::string& tag_hash); // Returns a commit response that indicates a successful commit of the // given |request_data|. Updates server state accordingly. - CommitResponseData SuccessfulCommitResponse( - const CommitRequestData& request_data); + syncer_v2::CommitResponseData SuccessfulCommitResponse( + const syncer_v2::CommitRequestData& request_data); // Sets the encryption key name used for updates from the server. // (ie. the key other clients are using to encrypt their commits.) @@ -71,7 +72,7 @@ class MockModelTypeSyncWorker : public ModelTypeSyncWorker { void SetServerVersion(const std::string& tag_hash, int64 version); // A record of past commits requests. - std::vector<CommitRequestDataList> commit_request_lists_; + std::vector<syncer_v2::CommitRequestDataList> commit_request_lists_; // Map of versions by client tag. // This is an essential part of the mocked server state. |