Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/glue/generic_change_processor.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/generic_change_processor.h ('k') | chrome/browser/sync/glue/history_model_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/generic_change_processor.cc
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index 640df3a76267beab28a5baa8fb4ff5a5a2593037..a12df1c4b892d6ce06e4964b4c05674964c22379 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -26,8 +26,8 @@ namespace browser_sync {
GenericChangeProcessor::GenericChangeProcessor(
DataTypeErrorHandler* error_handler,
- const base::WeakPtr<csync::SyncableService>& local_service,
- csync::UserShare* user_share)
+ const base::WeakPtr<syncer::SyncableService>& local_service,
+ syncer::UserShare* user_share)
: ChangeProcessor(error_handler),
local_service_(local_service),
share_handle_(user_share) {
@@ -39,24 +39,25 @@ GenericChangeProcessor::~GenericChangeProcessor() {
}
void GenericChangeProcessor::ApplyChangesFromSyncModel(
- const csync::BaseTransaction* trans,
- const csync::ImmutableChangeRecordList& changes) {
+ const syncer::BaseTransaction* trans,
+ const syncer::ImmutableChangeRecordList& changes) {
DCHECK(CalledOnValidThread());
DCHECK(running());
DCHECK(syncer_changes_.empty());
- for (csync::ChangeRecordList::const_iterator it =
+ for (syncer::ChangeRecordList::const_iterator it =
changes.Get().begin(); it != changes.Get().end(); ++it) {
- if (it->action == csync::ChangeRecord::ACTION_DELETE) {
+ if (it->action == syncer::ChangeRecord::ACTION_DELETE) {
syncer_changes_.push_back(
- csync::SyncChange(csync::SyncChange::ACTION_DELETE,
- csync::SyncData::CreateRemoteData(it->id, it->specifics)));
+ syncer::SyncChange(
+ syncer::SyncChange::ACTION_DELETE,
+ syncer::SyncData::CreateRemoteData(it->id, it->specifics)));
} else {
- csync::SyncChange::SyncChangeType action =
- (it->action == csync::ChangeRecord::ACTION_ADD) ?
- csync::SyncChange::ACTION_ADD : csync::SyncChange::ACTION_UPDATE;
+ syncer::SyncChange::SyncChangeType action =
+ (it->action == syncer::ChangeRecord::ACTION_ADD) ?
+ syncer::SyncChange::ACTION_ADD : syncer::SyncChange::ACTION_UPDATE;
// Need to load specifics from node.
- csync::ReadNode read_node(trans);
- if (read_node.InitByIdLookup(it->id) != csync::BaseNode::INIT_OK) {
+ syncer::ReadNode read_node(trans);
+ if (read_node.InitByIdLookup(it->id) != syncer::BaseNode::INIT_OK) {
error_handler()->OnSingleDatatypeUnrecoverableError(
FROM_HERE,
"Failed to look up data for received change with id " +
@@ -64,8 +65,8 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
return;
}
syncer_changes_.push_back(
- csync::SyncChange(action,
- csync::SyncData::CreateRemoteData(
+ syncer::SyncChange(action,
+ syncer::SyncData::CreateRemoteData(
it->id, read_node.GetEntitySpecifics())));
}
}
@@ -79,12 +80,12 @@ void GenericChangeProcessor::CommitChangesFromSyncModel() {
return;
if (!local_service_) {
syncable::ModelType type = syncer_changes_[0].sync_data().GetDataType();
- csync::SyncError error(FROM_HERE, "Local service destroyed.", type);
+ syncer::SyncError error(FROM_HERE, "Local service destroyed.", type);
error_handler()->OnSingleDatatypeUnrecoverableError(error.location(),
error.message());
return;
}
- csync::SyncError error = local_service_->ProcessSyncChanges(FROM_HERE,
+ syncer::SyncError error = local_service_->ProcessSyncChanges(FROM_HERE,
syncer_changes_);
syncer_changes_.clear();
if (error.IsSet()) {
@@ -93,16 +94,16 @@ void GenericChangeProcessor::CommitChangesFromSyncModel() {
}
}
-csync::SyncError GenericChangeProcessor::GetSyncDataForType(
+syncer::SyncError GenericChangeProcessor::GetSyncDataForType(
syncable::ModelType type,
- csync::SyncDataList* current_sync_data) {
+ syncer::SyncDataList* current_sync_data) {
DCHECK(CalledOnValidThread());
std::string type_name = syncable::ModelTypeToString(type);
- csync::ReadTransaction trans(FROM_HERE, share_handle());
- csync::ReadNode root(&trans);
+ syncer::ReadTransaction trans(FROM_HERE, share_handle());
+ syncer::ReadNode root(&trans);
if (root.InitByTagLookup(syncable::ModelTypeToRootTag(type)) !=
- csync::BaseNode::INIT_OK) {
- csync::SyncError error(FROM_HERE,
+ syncer::BaseNode::INIT_OK) {
+ syncer::SyncError error(FROM_HERE,
"Server did not create the top-level " + type_name +
" node. We might be running against an out-of-date server.",
type);
@@ -113,20 +114,20 @@ csync::SyncError GenericChangeProcessor::GetSyncDataForType(
DCHECK_NE(type, syncable::BOOKMARKS);
int64 sync_child_id = root.GetFirstChildId();
- while (sync_child_id != csync::kInvalidId) {
- csync::ReadNode sync_child_node(&trans);
+ while (sync_child_id != syncer::kInvalidId) {
+ syncer::ReadNode sync_child_node(&trans);
if (sync_child_node.InitByIdLookup(sync_child_id) !=
- csync::BaseNode::INIT_OK) {
- csync::SyncError error(FROM_HERE,
+ syncer::BaseNode::INIT_OK) {
+ syncer::SyncError error(FROM_HERE,
"Failed to fetch child node for type " + type_name + ".",
type);
return error;
}
- current_sync_data->push_back(csync::SyncData::CreateRemoteData(
+ current_sync_data->push_back(syncer::SyncData::CreateRemoteData(
sync_child_node.GetId(), sync_child_node.GetEntitySpecifics()));
sync_child_id = sync_child_node.GetSuccessorId();
}
- return csync::SyncError();
+ return syncer::SyncError();
}
namespace {
@@ -136,15 +137,15 @@ namespace {
// modifying any code around an OnSingleDatatypeUnrecoverableError call, else
// the compiler attempts to merge it with other calls, losing useful information
// in breakpad uploads.
-csync::SyncError LogLookupFailure(
- csync::BaseNode::InitByLookupResult lookup_result,
+syncer::SyncError LogLookupFailure(
+ syncer::BaseNode::InitByLookupResult lookup_result,
const tracked_objects::Location& from_here,
const std::string& error_prefix,
syncable::ModelType type,
DataTypeErrorHandler* error_handler) {
switch (lookup_result) {
- case csync::BaseNode::INIT_FAILED_ENTRY_NOT_GOOD: {
- csync::SyncError error;
+ case syncer::BaseNode::INIT_FAILED_ENTRY_NOT_GOOD: {
+ syncer::SyncError error;
error.Reset(from_here,
error_prefix +
"could not find entry matching the lookup criteria.",
@@ -154,24 +155,24 @@ csync::SyncError LogLookupFailure(
LOG(ERROR) << "Delete: Bad entry.";
return error;
}
- case csync::BaseNode::INIT_FAILED_ENTRY_IS_DEL: {
- csync::SyncError error;
+ case syncer::BaseNode::INIT_FAILED_ENTRY_IS_DEL: {
+ syncer::SyncError error;
error.Reset(from_here, error_prefix + "entry is already deleted.", type);
error_handler->OnSingleDatatypeUnrecoverableError(FROM_HERE,
error.message());
LOG(ERROR) << "Delete: Deleted entry.";
return error;
}
- case csync::BaseNode::INIT_FAILED_DECRYPT_IF_NECESSARY: {
- csync::SyncError error;
+ case syncer::BaseNode::INIT_FAILED_DECRYPT_IF_NECESSARY: {
+ syncer::SyncError error;
error.Reset(from_here, error_prefix + "unable to decrypt", type);
error_handler->OnSingleDatatypeUnrecoverableError(FROM_HERE,
error.message());
LOG(ERROR) << "Delete: Undecryptable entry.";
return error;
}
- case csync::BaseNode::INIT_FAILED_PRECONDITION: {
- csync::SyncError error;
+ case syncer::BaseNode::INIT_FAILED_PRECONDITION: {
+ syncer::SyncError error;
error.Reset(from_here,
error_prefix + "a precondition was not met for calling init.",
type);
@@ -181,7 +182,7 @@ csync::SyncError LogLookupFailure(
return error;
}
default: {
- csync::SyncError error;
+ syncer::SyncError error;
// Should have listed all the possible error cases above.
error.Reset(from_here, error_prefix + "unknown error", type);
error_handler->OnSingleDatatypeUnrecoverableError(FROM_HERE,
@@ -192,16 +193,16 @@ csync::SyncError LogLookupFailure(
}
}
-csync::SyncError AttemptDelete(const csync::SyncChange& change,
+syncer::SyncError AttemptDelete(const syncer::SyncChange& change,
syncable::ModelType type,
const std::string& type_str,
- csync::WriteNode* node,
+ syncer::WriteNode* node,
DataTypeErrorHandler* error_handler) {
- DCHECK_EQ(change.change_type(), csync::SyncChange::ACTION_DELETE);
+ DCHECK_EQ(change.change_type(), syncer::SyncChange::ACTION_DELETE);
if (change.sync_data().IsLocal()) {
const std::string& tag = change.sync_data().GetTag();
if (tag.empty()) {
- csync::SyncError error(
+ syncer::SyncError error(
FROM_HERE,
"Failed to delete " + type_str + " node. Local data, empty tag.",
type);
@@ -211,18 +212,18 @@ csync::SyncError AttemptDelete(const csync::SyncChange& change,
return error;
}
- csync::BaseNode::InitByLookupResult result =
+ syncer::BaseNode::InitByLookupResult result =
node->InitByClientTagLookup(change.sync_data().GetDataType(), tag);
- if (result != csync::BaseNode::INIT_OK) {
+ if (result != syncer::BaseNode::INIT_OK) {
return LogLookupFailure(
result, FROM_HERE,
"Failed to delete " + type_str + " node. Local data, ",
type, error_handler);
}
} else {
- csync::BaseNode::InitByLookupResult result =
+ syncer::BaseNode::InitByLookupResult result =
node->InitByIdLookup(change.sync_data().GetRemoteId());
- if (result != csync::BaseNode::INIT_OK) {
+ if (result != syncer::BaseNode::INIT_OK) {
return LogLookupFailure(
result, FROM_HERE,
"Failed to delete " + type_str + " node. Non-local data, ",
@@ -230,7 +231,7 @@ csync::SyncError AttemptDelete(const csync::SyncChange& change,
}
}
node->Remove();
- return csync::SyncError();
+ return syncer::SyncError();
}
} // namespace
@@ -239,35 +240,36 @@ csync::SyncError AttemptDelete(const csync::SyncChange& change,
// modifying any code around an OnSingleDatatypeUnrecoverableError call, else
// the compiler attempts to merge it with other calls, losing useful information
// in breakpad uploads.
-csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
+syncer::SyncError GenericChangeProcessor::ProcessSyncChanges(
const tracked_objects::Location& from_here,
- const csync::SyncChangeList& list_of_changes) {
+ const syncer::SyncChangeList& list_of_changes) {
DCHECK(CalledOnValidThread());
- csync::WriteTransaction trans(from_here, share_handle());
+ syncer::WriteTransaction trans(from_here, share_handle());
- for (csync::SyncChangeList::const_iterator iter = list_of_changes.begin();
+ for (syncer::SyncChangeList::const_iterator iter = list_of_changes.begin();
iter != list_of_changes.end();
++iter) {
- const csync::SyncChange& change = *iter;
+ const syncer::SyncChange& change = *iter;
DCHECK_NE(change.sync_data().GetDataType(), syncable::UNSPECIFIED);
syncable::ModelType type = change.sync_data().GetDataType();
std::string type_str = syncable::ModelTypeToString(type);
- csync::WriteNode sync_node(&trans);
- if (change.change_type() == csync::SyncChange::ACTION_DELETE) {
- csync::SyncError error = AttemptDelete(change, type, type_str, &sync_node,
- error_handler());
+ syncer::WriteNode sync_node(&trans);
+ if (change.change_type() == syncer::SyncChange::ACTION_DELETE) {
+ syncer::SyncError error =
+ AttemptDelete(change, type, type_str, &sync_node,
+ error_handler());
if (error.IsSet()) {
NOTREACHED();
return error;
}
- } else if (change.change_type() == csync::SyncChange::ACTION_ADD) {
+ } else if (change.change_type() == syncer::SyncChange::ACTION_ADD) {
// TODO(sync): Handle other types of creation (custom parents, folders,
// etc.).
- csync::ReadNode root_node(&trans);
+ syncer::ReadNode root_node(&trans);
if (root_node.InitByTagLookup(
syncable::ModelTypeToRootTag(change.sync_data().GetDataType())) !=
- csync::BaseNode::INIT_OK) {
- csync::SyncError error(FROM_HERE,
+ syncer::BaseNode::INIT_OK) {
+ syncer::SyncError error(FROM_HERE,
"Failed to look up root node for type " + type_str,
type);
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
@@ -276,31 +278,31 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Create: no root node.";
return error;
}
- csync::WriteNode::InitUniqueByCreationResult result =
+ syncer::WriteNode::InitUniqueByCreationResult result =
sync_node.InitUniqueByCreation(change.sync_data().GetDataType(),
root_node,
change.sync_data().GetTag());
- if (result != csync::WriteNode::INIT_SUCCESS) {
+ if (result != syncer::WriteNode::INIT_SUCCESS) {
std::string error_prefix = "Failed to create " + type_str + " node: ";
switch (result) {
- case csync::WriteNode::INIT_FAILED_EMPTY_TAG: {
- csync::SyncError error;
+ case syncer::WriteNode::INIT_FAILED_EMPTY_TAG: {
+ syncer::SyncError error;
error.Reset(FROM_HERE, error_prefix + "empty tag", type);
error_handler()->OnSingleDatatypeUnrecoverableError(
FROM_HERE, error.message());
LOG(ERROR) << "Create: Empty tag.";
return error;
}
- case csync::WriteNode::INIT_FAILED_ENTRY_ALREADY_EXISTS: {
- csync::SyncError error;
+ case syncer::WriteNode::INIT_FAILED_ENTRY_ALREADY_EXISTS: {
+ syncer::SyncError error;
error.Reset(FROM_HERE, error_prefix + "entry already exists", type);
error_handler()->OnSingleDatatypeUnrecoverableError(
FROM_HERE, error.message());
LOG(ERROR) << "Create: Entry exists.";
return error;
}
- case csync::WriteNode::INIT_FAILED_COULD_NOT_CREATE_ENTRY: {
- csync::SyncError error;
+ case syncer::WriteNode::INIT_FAILED_COULD_NOT_CREATE_ENTRY: {
+ syncer::SyncError error;
error.Reset(FROM_HERE, error_prefix + "failed to create entry",
type);
error_handler()->OnSingleDatatypeUnrecoverableError(
@@ -308,8 +310,8 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Create: Could not create entry.";
return error;
}
- case csync::WriteNode::INIT_FAILED_SET_PREDECESSOR: {
- csync::SyncError error;
+ case syncer::WriteNode::INIT_FAILED_SET_PREDECESSOR: {
+ syncer::SyncError error;
error.Reset(FROM_HERE, error_prefix + "failed to set predecessor",
type);
error_handler()->OnSingleDatatypeUnrecoverableError(
@@ -318,7 +320,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
return error;
}
default: {
- csync::SyncError error;
+ syncer::SyncError error;
error.Reset(FROM_HERE, error_prefix + "unknown error", type);
error_handler()->OnSingleDatatypeUnrecoverableError(
FROM_HERE, error.message());
@@ -329,14 +331,14 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
}
sync_node.SetTitle(UTF8ToWide(change.sync_data().GetTitle()));
sync_node.SetEntitySpecifics(change.sync_data().GetSpecifics());
- } else if (change.change_type() == csync::SyncChange::ACTION_UPDATE) {
+ } else if (change.change_type() == syncer::SyncChange::ACTION_UPDATE) {
// TODO(zea): consider having this logic for all possible changes?
- csync::BaseNode::InitByLookupResult result =
+ syncer::BaseNode::InitByLookupResult result =
sync_node.InitByClientTagLookup(change.sync_data().GetDataType(),
change.sync_data().GetTag());
- if (result != csync::BaseNode::INIT_OK) {
- if (result == csync::BaseNode::INIT_FAILED_PRECONDITION) {
- csync::SyncError error;
+ if (result != syncer::BaseNode::INIT_OK) {
+ if (result == syncer::BaseNode::INIT_FAILED_PRECONDITION) {
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load entry w/empty tag for " + type_str + ".",
type);
@@ -344,8 +346,8 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
FROM_HERE, error.message());
LOG(ERROR) << "Update: Empty tag.";
return error;
- } else if (result == csync::BaseNode::INIT_FAILED_ENTRY_NOT_GOOD) {
- csync::SyncError error;
+ } else if (result == syncer::BaseNode::INIT_FAILED_ENTRY_NOT_GOOD) {
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load bad entry for " + type_str + ".",
type);
@@ -353,8 +355,8 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
FROM_HERE, error.message());
LOG(ERROR) << "Update: bad entry.";
return error;
- } else if (result == csync::BaseNode::INIT_FAILED_ENTRY_IS_DEL) {
- csync::SyncError error;
+ } else if (result == syncer::BaseNode::INIT_FAILED_ENTRY_IS_DEL) {
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load deleted entry for " + type_str + ".",
type);
@@ -363,7 +365,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Update: deleted entry.";
return error;
} else {
- csync::Cryptographer* crypto = trans.GetCryptographer();
+ syncer::Cryptographer* crypto = trans.GetCryptographer();
syncable::ModelTypeSet encrypted_types(crypto->GetEncryptedTypes());
const sync_pb::EntitySpecifics& specifics =
sync_node.GetEntry()->Get(syncable::SPECIFICS);
@@ -371,7 +373,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
const bool can_decrypt = crypto->CanDecrypt(specifics.encrypted());
const bool agreement = encrypted_types.Has(type);
if (!agreement && !can_decrypt) {
- csync::SyncError error;
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load encrypted entry, missing key and "
"nigori mismatch for " + type_str + ".",
@@ -381,7 +383,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Update: encr case 1.";
return error;
} else if (agreement && can_decrypt) {
- csync::SyncError error;
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load encrypted entry, we have the key "
"and the nigori matches (?!) for " + type_str + ".",
@@ -391,7 +393,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Update: encr case 2.";
return error;
} else if (agreement) {
- csync::SyncError error;
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load encrypted entry, missing key and "
"the nigori matches for " + type_str + ".",
@@ -401,7 +403,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
LOG(ERROR) << "Update: encr case 3.";
return error;
} else {
- csync::SyncError error;
+ syncer::SyncError error;
error.Reset(FROM_HERE,
"Failed to load encrypted entry, we have the key"
"(?!) and nigori mismatch for " + type_str + ".",
@@ -419,9 +421,9 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
// successor, parent, etc.).
}
} else {
- csync::SyncError error(
+ syncer::SyncError error(
FROM_HERE,
- "Received unset csync::SyncChange in the change processor.",
+ "Received unset syncer::SyncChange in the change processor.",
type);
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
error.message());
@@ -430,7 +432,7 @@ csync::SyncError GenericChangeProcessor::ProcessSyncChanges(
return error;
}
}
- return csync::SyncError();
+ return syncer::SyncError();
}
bool GenericChangeProcessor::SyncModelHasUserCreatedNodes(
@@ -443,10 +445,10 @@ bool GenericChangeProcessor::SyncModelHasUserCreatedNodes(
std::string err_str = "Server did not create the top-level " + type_name +
" node. We might be running against an out-of-date server.";
*has_nodes = false;
- csync::ReadTransaction trans(FROM_HERE, share_handle());
- csync::ReadNode type_root_node(&trans);
+ syncer::ReadTransaction trans(FROM_HERE, share_handle());
+ syncer::ReadNode type_root_node(&trans);
if (type_root_node.InitByTagLookup(syncable::ModelTypeToRootTag(type)) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
LOG(ERROR) << err_str;
return false;
}
@@ -461,7 +463,7 @@ bool GenericChangeProcessor::CryptoReadyIfNecessary(syncable::ModelType type) {
DCHECK(CalledOnValidThread());
DCHECK_NE(type, syncable::UNSPECIFIED);
// We only access the cryptographer while holding a transaction.
- csync::ReadTransaction trans(FROM_HERE, share_handle());
+ syncer::ReadTransaction trans(FROM_HERE, share_handle());
const syncable::ModelTypeSet encrypted_types = GetEncryptedTypes(&trans);
return !encrypted_types.Has(type) ||
trans.GetCryptographer()->is_ready();
@@ -475,7 +477,7 @@ void GenericChangeProcessor::StopImpl() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
-csync::UserShare* GenericChangeProcessor::share_handle() const {
+syncer::UserShare* GenericChangeProcessor::share_handle() const {
DCHECK(CalledOnValidThread());
return share_handle_;
}
« no previous file with comments | « chrome/browser/sync/glue/generic_change_processor.h ('k') | chrome/browser/sync/glue/history_model_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698