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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/process_commit_response_command_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights 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 | « sync/engine/process_commit_response_command.cc ('k') | sync/engine/process_updates_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/process_commit_response_command_unittest.cc
diff --git a/sync/engine/process_commit_response_command_unittest.cc b/sync/engine/process_commit_response_command_unittest.cc
index a387bd228c102694880d52751b73536b0ea458da..be9fa22216b231f3e5ef2a58ac2d78dbae8074e1 100644
--- a/sync/engine/process_commit_response_command_unittest.cc
+++ b/sync/engine/process_commit_response_command_unittest.cc
@@ -46,9 +46,9 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest {
make_scoped_refptr(new FakeModelWorker(GROUP_DB)));
workers()->push_back(
make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
- (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
- (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI;
- (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB;
+ (*mutable_routing_info())[syncer::BOOKMARKS] = GROUP_UI;
+ (*mutable_routing_info())[syncer::PREFERENCES] = GROUP_UI;
+ (*mutable_routing_info())[syncer::AUTOFILL] = GROUP_DB;
SyncerCommandTest::SetUp();
}
@@ -62,7 +62,7 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest {
}
void CheckEntry(Entry* e, const std::string& name,
- syncable::ModelType model_type, const Id& parent_id) {
+ syncer::ModelType model_type, const Id& parent_id) {
EXPECT_TRUE(e->good());
ASSERT_EQ(name, e->Get(NON_UNIQUE_NAME));
ASSERT_EQ(model_type, e->GetModelType());
@@ -79,7 +79,7 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest {
const Id& parent_id,
const string& name,
bool is_folder,
- syncable::ModelType model_type,
+ syncer::ModelType model_type,
int64* metahandle_out) {
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
Id predecessor_id;
@@ -96,7 +96,7 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest {
entry.Put(syncable::PARENT_ID, parent_id);
entry.PutPredecessor(predecessor_id);
sync_pb::EntitySpecifics default_specifics;
- syncable::AddDefaultFieldValue(model_type, &default_specifics);
+ syncer::AddDefaultFieldValue(model_type, &default_specifics);
entry.Put(syncable::SPECIFICS, default_specifics);
if (item_id.ServerKnows()) {
entry.Put(syncable::SERVER_SPECIFICS, default_specifics);
@@ -116,7 +116,7 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest {
const Id& item_id,
const Id& parent_id,
const string& name,
- syncable::ModelType model_type,
+ syncer::ModelType model_type,
sessions::OrderedCommitSet *commit_set,
syncer::ClientToServerMessage *commit,
syncer::ClientToServerResponse *response) {
@@ -200,25 +200,25 @@ TEST_F(ProcessCommitResponseCommandTest, MultipleCommitIdProjections) {
Id autofill_id1 = id_factory_.NewLocalId();
Id autofill_id2 = id_factory_.NewLocalId();
CreateUnprocessedCommitResult(bookmark_folder_id, id_factory_.root(),
- "A bookmark folder", syncable::BOOKMARKS,
+ "A bookmark folder", syncer::BOOKMARKS,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(bookmark_id1, bookmark_folder_id,
- "bookmark 1", syncable::BOOKMARKS,
+ "bookmark 1", syncer::BOOKMARKS,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(bookmark_id2, bookmark_folder_id,
- "bookmark 2", syncable::BOOKMARKS,
+ "bookmark 2", syncer::BOOKMARKS,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(pref_id1, id_factory_.root(),
- "Pref 1", syncable::PREFERENCES,
+ "Pref 1", syncer::PREFERENCES,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(pref_id2, id_factory_.root(),
- "Pref 2", syncable::PREFERENCES,
+ "Pref 2", syncer::PREFERENCES,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(autofill_id1, id_factory_.root(),
- "Autofill 1", syncable::AUTOFILL,
+ "Autofill 1", syncer::AUTOFILL,
&commit_set, &request, &response);
CreateUnprocessedCommitResult(autofill_id2, id_factory_.root(),
- "Autofill 2", syncable::AUTOFILL,
+ "Autofill 2", syncer::AUTOFILL,
&commit_set, &request, &response);
ProcessCommitResponseCommand command(commit_set, request, response);
@@ -245,20 +245,20 @@ TEST_F(ProcessCommitResponseCommandTest, MultipleCommitIdProjections) {
ASSERT_TRUE(directory()->GetFirstChildId(&trans, new_fid, &cid));
Entry b1(&trans, syncable::GET_BY_ID, cid);
Entry b2(&trans, syncable::GET_BY_ID, b1.Get(syncable::NEXT_ID));
- CheckEntry(&b1, "bookmark 1", syncable::BOOKMARKS, new_fid);
- CheckEntry(&b2, "bookmark 2", syncable::BOOKMARKS, new_fid);
+ CheckEntry(&b1, "bookmark 1", syncer::BOOKMARKS, new_fid);
+ CheckEntry(&b2, "bookmark 2", syncer::BOOKMARKS, new_fid);
ASSERT_TRUE(b2.Get(syncable::NEXT_ID).IsRoot());
// Look at the prefs and autofill items.
Entry p1(&trans, syncable::GET_BY_ID, b_folder.Get(syncable::NEXT_ID));
Entry p2(&trans, syncable::GET_BY_ID, p1.Get(syncable::NEXT_ID));
- CheckEntry(&p1, "Pref 1", syncable::PREFERENCES, id_factory_.root());
- CheckEntry(&p2, "Pref 2", syncable::PREFERENCES, id_factory_.root());
+ CheckEntry(&p1, "Pref 1", syncer::PREFERENCES, id_factory_.root());
+ CheckEntry(&p2, "Pref 2", syncer::PREFERENCES, id_factory_.root());
Entry a1(&trans, syncable::GET_BY_ID, p2.Get(syncable::NEXT_ID));
Entry a2(&trans, syncable::GET_BY_ID, a1.Get(syncable::NEXT_ID));
- CheckEntry(&a1, "Autofill 1", syncable::AUTOFILL, id_factory_.root());
- CheckEntry(&a2, "Autofill 2", syncable::AUTOFILL, id_factory_.root());
+ CheckEntry(&a1, "Autofill 1", syncer::AUTOFILL, id_factory_.root());
+ CheckEntry(&a2, "Autofill 2", syncer::AUTOFILL, id_factory_.root());
ASSERT_TRUE(a2.Get(syncable::NEXT_ID).IsRoot());
}
@@ -280,7 +280,7 @@ TEST_F(ProcessCommitResponseCommandTest, NewFolderCommitKeepsChildOrder) {
// Create the parent folder, a new item whose ID will change on commit.
Id folder_id = id_factory_.NewLocalId();
CreateUnprocessedCommitResult(folder_id, id_factory_.root(), "A",
- syncable::BOOKMARKS,
+ syncer::BOOKMARKS,
&commit_set, &request, &response);
// Verify that the item is reachable.
@@ -300,7 +300,7 @@ TEST_F(ProcessCommitResponseCommandTest, NewFolderCommitKeepsChildOrder) {
// Alternate between new and old child items, just for kicks.
Id id = (i % 4 < 2) ? id_factory_.NewLocalId() : id_factory_.NewServerId();
CreateUnprocessedCommitResult(
- id, folder_id, base::StringPrintf("Item %d", i), syncable::BOOKMARKS,
+ id, folder_id, base::StringPrintf("Item %d", i), syncer::BOOKMARKS,
&commit_set, &request, &response);
}
// The second 25 children will be unsynced items but NOT part of the commit
@@ -311,7 +311,7 @@ TEST_F(ProcessCommitResponseCommandTest, NewFolderCommitKeepsChildOrder) {
// Alternate between new and old child items, just for kicks.
Id id = (i % 4 < 2) ? id_factory_.NewLocalId() : id_factory_.NewServerId();
CreateUnsyncedItem(id, folder_id, base::StringPrintf("Item %d", i),
- false, syncable::BOOKMARKS, NULL);
+ false, syncer::BOOKMARKS, NULL);
}
// Process the commit response for the parent folder and the first
@@ -405,19 +405,19 @@ TEST_P(MixedResult, ExtensionActivity) {
syncer::ClientToServerMessage request;
syncer::ClientToServerResponse response;
- EXPECT_NE(routing_info().find(syncable::BOOKMARKS)->second,
- routing_info().find(syncable::AUTOFILL)->second)
+ EXPECT_NE(routing_info().find(syncer::BOOKMARKS)->second,
+ routing_info().find(syncer::AUTOFILL)->second)
<< "To not be lame, this test requires more than one active group.";
// Bookmark item setup.
CreateUnprocessedCommitResult(id_factory_.NewServerId(),
- id_factory_.root(), "Some bookmark", syncable::BOOKMARKS,
+ id_factory_.root(), "Some bookmark", syncer::BOOKMARKS,
&commit_set, &request, &response);
if (ShouldFailBookmarkCommit())
SetLastErrorCode(CommitResponse::TRANSIENT_ERROR, &response);
// Autofill item setup.
CreateUnprocessedCommitResult(id_factory_.NewServerId(),
- id_factory_.root(), "Some autofill", syncable::AUTOFILL,
+ id_factory_.root(), "Some autofill", syncer::AUTOFILL,
&commit_set, &request, &response);
if (ShouldFailAutofillCommit())
SetLastErrorCode(CommitResponse::TRANSIENT_ERROR, &response);
« no previous file with comments | « sync/engine/process_commit_response_command.cc ('k') | sync/engine/process_updates_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698