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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.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/typed_url_model_associator.h ('k') | chrome/browser/sync/glue/typed_url_model_associator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/typed_url_model_associator.cc
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc
index 729495e597938dcb74e2a95c586976da906205f9..d05c8d65151060c682cd2627f815cfffa4dfb14e 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -138,9 +138,9 @@ bool TypedUrlModelAssociator::ShouldIgnoreUrl(
return true;
}
-csync::SyncError TypedUrlModelAssociator::AssociateModels() {
+syncer::SyncError TypedUrlModelAssociator::AssociateModels() {
ClearErrorStats();
- csync::SyncError error = DoAssociateModels();
+ syncer::SyncError error = DoAssociateModels();
UMA_HISTOGRAM_PERCENTAGE("Sync.TypedUrlModelAssociationErrors",
GetErrorPercentage());
ClearErrorStats();
@@ -156,12 +156,12 @@ int TypedUrlModelAssociator::GetErrorPercentage() const {
return num_db_accesses_ ? (100 * num_db_errors_ / num_db_accesses_) : 0;
}
-csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
+syncer::SyncError TypedUrlModelAssociator::DoAssociateModels() {
DVLOG(1) << "Associating TypedUrl Models";
- csync::SyncError error;
+ syncer::SyncError error;
DCHECK(expected_loop_ == MessageLoop::current());
if (IsAbortPending())
- return csync::SyncError();
+ return syncer::SyncError();
history::URLRows typed_urls;
++num_db_accesses_;
if (!history_backend_->GetAllTypedURLs(&typed_urls)) {
@@ -177,7 +177,7 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
for (history::URLRows::iterator ix = typed_urls.begin();
ix != typed_urls.end();) {
if (IsAbortPending())
- return csync::SyncError();
+ return syncer::SyncError();
DCHECK_EQ(0U, visit_vectors.count(ix->id()));
if (!FixupURLAndGetVisits(&(*ix), &(visit_vectors[ix->id()])) ||
ShouldIgnoreUrl(*ix, visit_vectors[ix->id()])) {
@@ -194,10 +194,10 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
TypedUrlUpdateVector updated_urls;
{
- csync::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
- csync::ReadNode typed_url_root(&trans);
+ syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
+ syncer::ReadNode typed_url_root(&trans);
if (typed_url_root.InitByTagLookup(kTypedUrlTag) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
return error_handler_->CreateAndUploadError(
FROM_HERE,
"Server did not create the top-level typed_url node. We "
@@ -209,15 +209,15 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
for (history::URLRows::iterator ix = typed_urls.begin();
ix != typed_urls.end(); ++ix) {
if (IsAbortPending())
- return csync::SyncError();
+ return syncer::SyncError();
std::string tag = ix->url().spec();
// Empty URLs should be filtered out by ShouldIgnoreUrl() previously.
DCHECK(!tag.empty());
history::VisitVector& visits = visit_vectors[ix->id()];
- csync::ReadNode node(&trans);
+ syncer::ReadNode node(&trans);
if (node.InitByClientTagLookup(syncable::TYPED_URLS, tag) ==
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
// Same URL exists in sync data and in history data - compare the
// entries to see if there's any difference.
sync_pb::TypedUrlSpecifics typed_url(
@@ -235,9 +235,9 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
MergeResult difference =
MergeUrls(typed_url, *ix, &visits, &new_url, &added_visits);
if (difference & DIFF_UPDATE_NODE) {
- csync::WriteNode write_node(&trans);
+ syncer::WriteNode write_node(&trans);
if (write_node.InitByClientTagLookup(syncable::TYPED_URLS, tag) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
return error_handler_->CreateAndUploadError(
FROM_HERE,
"Failed to edit typed_url sync node.",
@@ -272,11 +272,11 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
}
} else {
// Sync has never seen this URL before.
- csync::WriteNode node(&trans);
- csync::WriteNode::InitUniqueByCreationResult result =
+ syncer::WriteNode node(&trans);
+ syncer::WriteNode::InitUniqueByCreationResult result =
node.InitUniqueByCreation(syncable::TYPED_URLS,
typed_url_root, tag);
- if (result != csync::WriteNode::INIT_SUCCESS) {
+ if (result != syncer::WriteNode::INIT_SUCCESS) {
return error_handler_->CreateAndUploadError(
FROM_HERE,
"Failed to create typed_url sync node: " + tag,
@@ -294,12 +294,12 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
// the history DB, so we can add them to our local history DB.
std::vector<int64> obsolete_nodes;
int64 sync_child_id = typed_url_root.GetFirstChildId();
- while (sync_child_id != csync::kInvalidId) {
+ while (sync_child_id != syncer::kInvalidId) {
if (IsAbortPending())
- return csync::SyncError();
- csync::ReadNode sync_child_node(&trans);
+ return syncer::SyncError();
+ syncer::ReadNode sync_child_node(&trans);
if (sync_child_node.InitByIdLookup(sync_child_id) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
return error_handler_->CreateAndUploadError(
FROM_HERE,
"Failed to fetch child node.",
@@ -357,9 +357,9 @@ csync::SyncError TypedUrlModelAssociator::DoAssociateModels() {
it != obsolete_nodes.end();
++it) {
if (IsAbortPending())
- return csync::SyncError();
- csync::WriteNode sync_node(&trans);
- if (sync_node.InitByIdLookup(*it) != csync::BaseNode::INIT_OK) {
+ return syncer::SyncError();
+ syncer::WriteNode sync_node(&trans);
+ if (sync_node.InitByIdLookup(*it) != syncer::BaseNode::INIT_OK) {
return error_handler_->CreateAndUploadError(
FROM_HERE,
"Failed to fetch obsolete node.",
@@ -435,21 +435,21 @@ sync_pb::TypedUrlSpecifics TypedUrlModelAssociator::FilterExpiredVisits(
}
bool TypedUrlModelAssociator::DeleteAllNodes(
- csync::WriteTransaction* trans) {
+ syncer::WriteTransaction* trans) {
DCHECK(expected_loop_ == MessageLoop::current());
// Just walk through all our child nodes and delete them.
- csync::ReadNode typed_url_root(trans);
+ syncer::ReadNode typed_url_root(trans);
if (typed_url_root.InitByTagLookup(kTypedUrlTag) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
LOG(ERROR) << "Could not lookup root node";
return false;
}
int64 sync_child_id = typed_url_root.GetFirstChildId();
- while (sync_child_id != csync::kInvalidId) {
- csync::WriteNode sync_child_node(trans);
+ while (sync_child_id != syncer::kInvalidId) {
+ syncer::WriteNode sync_child_node(trans);
if (sync_child_node.InitByIdLookup(sync_child_id) !=
- csync::BaseNode::INIT_OK) {
+ syncer::BaseNode::INIT_OK) {
LOG(ERROR) << "Typed url node lookup failed.";
return false;
}
@@ -459,8 +459,8 @@ bool TypedUrlModelAssociator::DeleteAllNodes(
return true;
}
-csync::SyncError TypedUrlModelAssociator::DisassociateModels() {
- return csync::SyncError();
+syncer::SyncError TypedUrlModelAssociator::DisassociateModels() {
+ return syncer::SyncError();
}
void TypedUrlModelAssociator::AbortAssociation() {
@@ -476,9 +476,9 @@ bool TypedUrlModelAssociator::IsAbortPending() {
bool TypedUrlModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
DCHECK(has_nodes);
*has_nodes = false;
- csync::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
- csync::ReadNode sync_node(&trans);
- if (sync_node.InitByTagLookup(kTypedUrlTag) != csync::BaseNode::INIT_OK) {
+ syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
+ syncer::ReadNode sync_node(&trans);
+ if (sync_node.InitByTagLookup(kTypedUrlTag) != syncer::BaseNode::INIT_OK) {
LOG(ERROR) << "Server did not create the top-level typed_url node. We "
<< "might be running against an out-of-date server.";
return false;
@@ -661,7 +661,7 @@ TypedUrlModelAssociator::MergeResult TypedUrlModelAssociator::MergeUrls(
void TypedUrlModelAssociator::WriteToSyncNode(
const history::URLRow& url,
const history::VisitVector& visits,
- csync::WriteNode* node) {
+ syncer::WriteNode* node) {
sync_pb::TypedUrlSpecifics typed_url;
WriteToTypedUrlSpecifics(url, visits, &typed_url);
node->SetTypedUrlSpecifics(typed_url);
@@ -821,9 +821,9 @@ void TypedUrlModelAssociator::UpdateURLRowFromTypedUrlSpecifics(
bool TypedUrlModelAssociator::CryptoReadyIfNecessary() {
// We only access the cryptographer while holding a transaction.
- csync::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
+ syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
const syncable::ModelTypeSet encrypted_types =
- csync::GetEncryptedTypes(&trans);
+ syncer::GetEncryptedTypes(&trans);
return !encrypted_types.Has(syncable::TYPED_URLS) ||
sync_service_->IsCryptographerReady(&trans);
}
« no previous file with comments | « chrome/browser/sync/glue/typed_url_model_associator.h ('k') | chrome/browser/sync/glue/typed_url_model_associator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698