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

Unified Diff: chrome/browser/sync/profile_sync_service_typed_url_unittest.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
Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index 705faec7e925bb802da871a5be17ec9c980d6076..336a5663a0ef3e2c0f3304dc1635f3ea16e4be0e 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -144,16 +144,16 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
public:
void AddTypedUrlSyncNode(const history::URLRow& url,
const history::VisitVector& visits) {
- csync::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
- csync::ReadNode typed_url_root(&trans);
- ASSERT_EQ(csync::BaseNode::INIT_OK,
+ syncer::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
+ syncer::ReadNode typed_url_root(&trans);
+ ASSERT_EQ(syncer::BaseNode::INIT_OK,
typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag));
- csync::WriteNode node(&trans);
+ syncer::WriteNode node(&trans);
std::string tag = url.url().spec();
- csync::WriteNode::InitUniqueByCreationResult result =
+ syncer::WriteNode::InitUniqueByCreationResult result =
node.InitUniqueByCreation(syncable::TYPED_URLS, typed_url_root, tag);
- ASSERT_EQ(csync::WriteNode::INIT_SUCCESS, result);
+ ASSERT_EQ(syncer::WriteNode::INIT_SUCCESS, result);
TypedUrlModelAssociator::WriteToSyncNode(url, visits, &node);
}
@@ -233,16 +233,16 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
void GetTypedUrlsFromSyncDB(history::URLRows* urls) {
urls->clear();
- csync::ReadTransaction trans(FROM_HERE, service_->GetUserShare());
- csync::ReadNode typed_url_root(&trans);
+ syncer::ReadTransaction trans(FROM_HERE, service_->GetUserShare());
+ syncer::ReadNode typed_url_root(&trans);
if (typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag) !=
- csync::BaseNode::INIT_OK)
+ syncer::BaseNode::INIT_OK)
return;
int64 child_id = typed_url_root.GetFirstChildId();
- while (child_id != csync::kInvalidId) {
- csync::ReadNode child_node(&trans);
- if (child_node.InitByIdLookup(child_id) != csync::BaseNode::INIT_OK)
+ while (child_id != syncer::kInvalidId) {
+ syncer::ReadNode child_node(&trans);
+ if (child_node.InitByIdLookup(child_id) != syncer::BaseNode::INIT_OK)
return;
const sync_pb::TypedUrlSpecifics& typed_url(
@@ -929,7 +929,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, FailToGetTypedURLs) {
sync_entries.push_back(sync_entry);
EXPECT_CALL(error_handler_, CreateAndUploadError(_, _, _)).
- WillOnce(Return(csync::SyncError(FROM_HERE,
+ WillOnce(Return(syncer::SyncError(FROM_HERE,
"Unit test",
syncable::TYPED_URLS)));
StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698