[Sync] Move ModelType and related classes to 'syncer' namespace

Previously they were in 'syncer::syncable'.

Also remove aliases to those classes from 'syncable'.

BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,

Review URL: https://chromiumcodereview.appspot.com/10696087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 93 insertions, 97 deletions

diff --git a/sync/sessions/ordered_commit_set.cc b/sync/sessions/ordered_commit_set.cc
index 1d13c09..06a5988 100644
--- a/sync/sessions/ordered_commit_set.cc
+++ b/sync/sessions/ordered_commit_set.cc
@@ -20,7 +20,7 @@ OrderedCommitSet::~OrderedCommitSet() {}
 
 void OrderedCommitSet::AddCommitItem(const int64 metahandle,
                                      const syncable::Id& commit_id,
-                                     syncable::ModelType type) {
+                                     syncer::ModelType type) {
   if (!HaveCommitItem(metahandle)) {
     inserted_metahandles_.insert(metahandle);
     metahandle_order_.push_back(metahandle);
@@ -100,7 +100,7 @@ OrderedCommitSet::CommitItem OrderedCommitSet::GetCommitItemAt(
 
 bool OrderedCommitSet::HasBookmarkCommitId() const {
   ModelSafeRoutingInfo::const_iterator group
-      = routes_.find(syncable::BOOKMARKS);
+      = routes_.find(syncer::BOOKMARKS);
   if (group == routes_.end())
     return false;
   Projections::const_iterator proj = projections_.find(group->second);
@@ -108,7 +108,7 @@ bool OrderedCommitSet::HasBookmarkCommitId() const {
     return false;
   DCHECK_LE(proj->second.size(), types_.size());
   for (size_t i = 0; i < proj->second.size(); i++) {
-    if (types_[proj->second[i]] == syncable::BOOKMARKS)
+    if (types_[proj->second[i]] == syncer::BOOKMARKS)
       return true;
   }
   return false;
diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
index ed606bc..e2d2450 100644
--- a/sync/sessions/ordered_commit_set.h
+++ b/sync/sessions/ordered_commit_set.h
@@ -38,7 +38,7 @@ class OrderedCommitSet {
   }
 
   void AddCommitItem(const int64 metahandle, const syncable::Id& commit_id,
-                     syncable::ModelType type);
+                     syncer::ModelType type);
 
   const std::vector<syncable::Id>& GetAllCommitIds() const {
     return commit_ids_;
@@ -56,7 +56,7 @@ class OrderedCommitSet {
   }
 
   // Same as above, but for ModelType of the item.
-  syncable::ModelType GetModelTypeAt(const size_t position) const {
+  syncer::ModelType GetModelTypeAt(const size_t position) const {
     return types_[position];
   }
 
@@ -95,7 +95,7 @@ class OrderedCommitSet {
   struct CommitItem {
     int64 meta;
     syncable::Id id;
-    syncable::ModelType group;
+    syncer::ModelType group;
   };
 
   CommitItem GetCommitItemAt(const size_t position) const;
@@ -113,7 +113,7 @@ class OrderedCommitSet {
   // projection.  We could store it in commit_ids_, but sometimes we want
   // to just return the vector of Ids, so this is more straightforward
   // and shouldn't take up too much extra space since commit lists are small.
-  std::vector<syncable::ModelType> types_;
+  std::vector<syncer::ModelType> types_;
 
   syncer::ModelSafeRoutingInfo routes_;
 };
diff --git a/sync/sessions/ordered_commit_set_unittest.cc b/sync/sessions/ordered_commit_set_unittest.cc
index 8bf420a..9be2992 100644
--- a/sync/sessions/ordered_commit_set_unittest.cc
+++ b/sync/sessions/ordered_commit_set_unittest.cc
@@ -15,10 +15,10 @@ namespace {
 class OrderedCommitSetTest : public testing::Test {
  public:
   OrderedCommitSetTest() {
-    routes_[syncable::BOOKMARKS] = syncer::GROUP_UI;
-    routes_[syncable::PREFERENCES] = syncer::GROUP_UI;
-    routes_[syncable::AUTOFILL] = syncer::GROUP_DB;
-    routes_[syncable::TOP_LEVEL_FOLDER] = syncer::GROUP_PASSIVE;
+    routes_[syncer::BOOKMARKS] = syncer::GROUP_UI;
+    routes_[syncer::PREFERENCES] = syncer::GROUP_UI;
+    routes_[syncer::AUTOFILL] = syncer::GROUP_DB;
+    routes_[syncer::TOP_LEVEL_FOLDER] = syncer::GROUP_PASSIVE;
   }
  protected:
   syncer::TestIdFactory ids_;
@@ -31,18 +31,18 @@ TEST_F(OrderedCommitSetTest, Projections) {
     expected.push_back(ids_.NewLocalId());
 
   OrderedCommitSet commit_set1(routes_), commit_set2(routes_);
-  commit_set1.AddCommitItem(0, expected[0], syncable::BOOKMARKS);
-  commit_set1.AddCommitItem(1, expected[1], syncable::BOOKMARKS);
-  commit_set1.AddCommitItem(2, expected[2], syncable::PREFERENCES);
+  commit_set1.AddCommitItem(0, expected[0], syncer::BOOKMARKS);
+  commit_set1.AddCommitItem(1, expected[1], syncer::BOOKMARKS);
+  commit_set1.AddCommitItem(2, expected[2], syncer::PREFERENCES);
   // Duplicates should be dropped.
-  commit_set1.AddCommitItem(2, expected[2], syncable::PREFERENCES);
-  commit_set1.AddCommitItem(3, expected[3], syncable::TOP_LEVEL_FOLDER);
-  commit_set1.AddCommitItem(4, expected[4], syncable::TOP_LEVEL_FOLDER);
-  commit_set2.AddCommitItem(7, expected[7], syncable::AUTOFILL);
-  commit_set2.AddCommitItem(6, expected[6], syncable::AUTOFILL);
-  commit_set2.AddCommitItem(5, expected[5], syncable::AUTOFILL);
+  commit_set1.AddCommitItem(2, expected[2], syncer::PREFERENCES);
+  commit_set1.AddCommitItem(3, expected[3], syncer::TOP_LEVEL_FOLDER);
+  commit_set1.AddCommitItem(4, expected[4], syncer::TOP_LEVEL_FOLDER);
+  commit_set2.AddCommitItem(7, expected[7], syncer::AUTOFILL);
+  commit_set2.AddCommitItem(6, expected[6], syncer::AUTOFILL);
+  commit_set2.AddCommitItem(5, expected[5], syncer::AUTOFILL);
   // Add something in set1 to set2, which should get dropped by AppendReverse.
-  commit_set2.AddCommitItem(0, expected[0], syncable::BOOKMARKS);
+  commit_set2.AddCommitItem(0, expected[0], syncer::BOOKMARKS);
   commit_set1.AppendReverse(commit_set2);
 
   // First, we should verify the projections are correct. Second, we want to
@@ -101,15 +101,15 @@ TEST_F(OrderedCommitSetTest, Projections) {
 TEST_F(OrderedCommitSetTest, HasBookmarkCommitId) {
   OrderedCommitSet commit_set(routes_);
 
-  commit_set.AddCommitItem(0, ids_.NewLocalId(), syncable::AUTOFILL);
-  commit_set.AddCommitItem(1, ids_.NewLocalId(), syncable::TOP_LEVEL_FOLDER);
+  commit_set.AddCommitItem(0, ids_.NewLocalId(), syncer::AUTOFILL);
+  commit_set.AddCommitItem(1, ids_.NewLocalId(), syncer::TOP_LEVEL_FOLDER);
   EXPECT_FALSE(commit_set.HasBookmarkCommitId());
 
-  commit_set.AddCommitItem(2, ids_.NewLocalId(), syncable::PREFERENCES);
-  commit_set.AddCommitItem(3, ids_.NewLocalId(), syncable::PREFERENCES);
+  commit_set.AddCommitItem(2, ids_.NewLocalId(), syncer::PREFERENCES);
+  commit_set.AddCommitItem(3, ids_.NewLocalId(), syncer::PREFERENCES);
   EXPECT_FALSE(commit_set.HasBookmarkCommitId());
 
-  commit_set.AddCommitItem(4, ids_.NewLocalId(), syncable::BOOKMARKS);
+  commit_set.AddCommitItem(4, ids_.NewLocalId(), syncer::BOOKMARKS);
   EXPECT_TRUE(commit_set.HasBookmarkCommitId());
 
   commit_set.Truncate(4);
@@ -121,7 +121,7 @@ TEST_F(OrderedCommitSetTest, AddAndRemoveEntries) {
 
   ASSERT_TRUE(commit_set.Empty());
 
-  commit_set.AddCommitItem(0, ids_.NewLocalId(), syncable::AUTOFILL);
+  commit_set.AddCommitItem(0, ids_.NewLocalId(), syncer::AUTOFILL);
   ASSERT_EQ(static_cast<size_t>(1), commit_set.Size());
 
   commit_set.Clear();
diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc
index 3d1b07c..b227ac7 100644
--- a/sync/sessions/session_state_unittest.cc
+++ b/sync/sessions/session_state_unittest.cc
@@ -30,11 +30,11 @@ class SessionStateTest : public testing::Test {};
 TEST_F(SessionStateTest, SyncSourceInfoToValue) {
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source =
       sync_pb::GetUpdatesCallerInfo::PERIODIC;
-  syncable::ModelTypePayloadMap types;
-  types[syncable::PREFERENCES] = "preferencespayload";
-  types[syncable::EXTENSIONS] = "";
+  syncer::ModelTypePayloadMap types;
+  types[syncer::PREFERENCES] = "preferencespayload";
+  types[syncer::EXTENSIONS] = "";
   scoped_ptr<DictionaryValue> expected_types_value(
-      syncable::ModelTypePayloadMapToValue(types));
+      syncer::ModelTypePayloadMapToValue(types));
 
   SyncSourceInfo source_info(updates_source, types);
 
@@ -57,16 +57,16 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
 
   const bool kIsShareUsable = true;
 
-  const syncable::ModelTypeSet initial_sync_ended(
-      syncable::BOOKMARKS, syncable::PREFERENCES);
+  const syncer::ModelTypeSet initial_sync_ended(
+      syncer::BOOKMARKS, syncer::PREFERENCES);
   scoped_ptr<ListValue> expected_initial_sync_ended_value(
-      syncable::ModelTypeSetToValue(initial_sync_ended));
+      syncer::ModelTypeSetToValue(initial_sync_ended));
 
-  syncable::ModelTypePayloadMap download_progress_markers;
-  download_progress_markers[syncable::BOOKMARKS] = "test";
-  download_progress_markers[syncable::APPS] = "apps";
+  syncer::ModelTypePayloadMap download_progress_markers;
+  download_progress_markers[syncer::BOOKMARKS] = "test";
+  download_progress_markers[syncer::APPS] = "apps";
   scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
-      syncable::ModelTypePayloadMapToValue(download_progress_markers));
+      syncer::ModelTypePayloadMapToValue(download_progress_markers));
 
   const bool kHasMoreToSync = false;
   const bool kIsSilenced = true;
diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc
index 7ca043e..64fbb856 100644
--- a/sync/sessions/status_controller.cc
+++ b/sync/sessions/status_controller.cc
@@ -13,9 +13,6 @@
 namespace syncer {
 namespace sessions {
 
-using syncable::FIRST_REAL_MODEL_TYPE;
-using syncable::MODEL_TYPE_COUNT;
-
 StatusController::StatusController(const ModelSafeRoutingInfo& routes)
     : per_model_group_deleter_(&per_model_group_),
       group_restriction_in_effect_(false),
@@ -98,7 +95,7 @@ void StatusController::increment_num_updates_downloaded_by(int value) {
 }
 
 void StatusController::set_types_needing_local_migration(
-    syncable::ModelTypeSet types) {
+    syncer::ModelTypeSet types) {
   model_neutral_.types_needing_local_migration = types;
 }
 
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
index 0780a93..85f3815 100644
--- a/sync/sessions/status_controller.h
+++ b/sync/sessions/status_controller.h
@@ -68,10 +68,10 @@ class StatusController {
       ModelSafeGroup group);
 
   // ClientToServer messages.
-  const syncable::ModelTypeSet updates_request_types() const {
+  const syncer::ModelTypeSet updates_request_types() const {
     return model_neutral_.updates_request_types;
   }
-  void set_updates_request_types(syncable::ModelTypeSet value) {
+  void set_updates_request_types(syncer::ModelTypeSet value) {
     model_neutral_.updates_request_types = value;
   }
   const ClientToServerResponse& updates_response() const {
@@ -143,7 +143,7 @@ class StatusController {
   }
 
   bool HasBookmarkCommitActivity() const {
-    return ActiveGroupRestrictionIncludesModel(syncable::BOOKMARKS);
+    return ActiveGroupRestrictionIncludesModel(syncer::BOOKMARKS);
   }
 
   const ModelNeutralState& model_neutral_state() const {
@@ -158,7 +158,7 @@ class StatusController {
   void increment_num_updates_downloaded_by(int value);
   void increment_num_tombstone_updates_downloaded_by(int value);
   void increment_num_reflected_updates_downloaded_by(int value);
-  void set_types_needing_local_migration(syncable::ModelTypeSet types);
+  void set_types_needing_local_migration(syncer::ModelTypeSet types);
   void increment_num_local_overwrites();
   void increment_num_server_overwrites();
   void set_sync_protocol_error(const SyncProtocolError& error);
@@ -179,7 +179,7 @@ class StatusController {
 
   // Check whether a particular model is included by the active group
   // restriction.
-  bool ActiveGroupRestrictionIncludesModel(syncable::ModelType model) const {
+  bool ActiveGroupRestrictionIncludesModel(syncer::ModelType model) const {
     if (!group_restriction_in_effect_)
       return true;
     ModelSafeRoutingInfo::const_iterator it = routing_info_.find(model);
diff --git a/sync/sessions/status_controller_unittest.cc b/sync/sessions/status_controller_unittest.cc
index b88ea26..055ba6d 100644
--- a/sync/sessions/status_controller_unittest.cc
+++ b/sync/sessions/status_controller_unittest.cc
@@ -12,7 +12,7 @@ namespace sessions {
 class StatusControllerTest : public testing::Test {
  public:
   virtual void SetUp() {
-    routes_[syncable::BOOKMARKS] = GROUP_UI;
+    routes_[syncer::BOOKMARKS] = GROUP_UI;
   }
  protected:
   ModelSafeRoutingInfo routes_;
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index 19a643d..0281dcd 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -48,17 +48,17 @@ std::set<ModelSafeGroup> ComputeEnabledGroups(
   return enabled_groups;
 }
 
-void PurgeStalePayload(syncable::ModelTypePayloadMap* original,
+void PurgeStalePayload(syncer::ModelTypePayloadMap* original,
                        const ModelSafeRoutingInfo& routing_info) {
-  std::vector<syncable::ModelTypePayloadMap::iterator> iterators_to_delete;
-  for (syncable::ModelTypePayloadMap::iterator i = original->begin();
+  std::vector<syncer::ModelTypePayloadMap::iterator> iterators_to_delete;
+  for (syncer::ModelTypePayloadMap::iterator i = original->begin();
        i != original->end(); ++i) {
     if (routing_info.end() == routing_info.find(i->first)) {
       iterators_to_delete.push_back(i);
     }
   }
 
-  for (std::vector<syncable::ModelTypePayloadMap::iterator>::iterator
+  for (std::vector<syncer::ModelTypePayloadMap::iterator>::iterator
        it = iterators_to_delete.begin(); it != iterators_to_delete.end();
        ++it) {
     original->erase(*it);
@@ -156,11 +156,11 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const {
   syncable::Directory* dir = context_->directory();
 
   bool is_share_useable = true;
-  syncable::ModelTypeSet initial_sync_ended;
-  syncable::ModelTypePayloadMap download_progress_markers;
-  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    syncable::ModelType type(syncable::ModelTypeFromInt(i));
+  syncer::ModelTypeSet initial_sync_ended;
+  syncer::ModelTypePayloadMap download_progress_markers;
+  for (int i = syncer::FIRST_REAL_MODEL_TYPE;
+       i < syncer::MODEL_TYPE_COUNT; ++i) {
+    syncer::ModelType type(syncer::ModelTypeFromInt(i));
     if (routing_info_.count(type) != 0) {
       if (dir->initial_sync_ended_for_type(type))
         initial_sync_ended.Put(type);
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index 45e2a08..6fe3bb0 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -53,8 +53,8 @@ class SyncSessionTest : public testing::Test,
             throttled_data_type_tracker_.get(),
             std::vector<SyncEngineEventListener*>(), NULL, NULL));
     routes_.clear();
-    routes_[syncable::BOOKMARKS] = GROUP_UI;
-    routes_[syncable::AUTOFILL] = GROUP_DB;
+    routes_[syncer::BOOKMARKS] = GROUP_UI;
+    routes_[syncer::AUTOFILL] = GROUP_DB;
     scoped_refptr<ModelSafeWorker> passive_worker(
         new FakeModelWorker(GROUP_PASSIVE));
     scoped_refptr<ModelSafeWorker> ui_worker(
@@ -118,14 +118,13 @@ class SyncSessionTest : public testing::Test,
       FAIL() << msg;
   }
 
-  syncable::ModelTypeSet ParamsMeaningAllEnabledTypes() {
-    syncable::ModelTypeSet request_params(
-        syncable::BOOKMARKS, syncable::AUTOFILL);
+  syncer::ModelTypeSet ParamsMeaningAllEnabledTypes() {
+    syncer::ModelTypeSet request_params(syncer::BOOKMARKS, syncer::AUTOFILL);
     return request_params;
   }
 
-  syncable::ModelTypeSet ParamsMeaningJustOneEnabledType() {
-    return syncable::ModelTypeSet(syncable::AUTOFILL);
+  syncer::ModelTypeSet ParamsMeaningJustOneEnabledType() {
+    return syncer::ModelTypeSet(syncer::AUTOFILL);
   }
 
   MessageLoop message_loop_;
@@ -267,12 +266,12 @@ TEST_F(SyncSessionTest, ResetTransientState) {
 TEST_F(SyncSessionTest, Coalesce) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  syncable::ModelTypePayloadMap one_type =
-      syncable::ModelTypePayloadMapFromEnumSet(
+  syncer::ModelTypePayloadMap one_type =
+      syncer::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromEnumSet(
+  syncer::ModelTypePayloadMap all_types =
+      syncer::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -287,9 +286,9 @@ TEST_F(SyncSessionTest, Coalesce) {
   workers_two.push_back(passive_worker);
   workers_two.push_back(db_worker);
   workers_two.push_back(ui_worker);
-  routes_one[syncable::AUTOFILL] = GROUP_DB;
-  routes_two[syncable::AUTOFILL] = GROUP_DB;
-  routes_two[syncable::BOOKMARKS] = GROUP_UI;
+  routes_one[syncer::AUTOFILL] = GROUP_DB;
+  routes_two[syncer::AUTOFILL] = GROUP_DB;
+  routes_two[syncer::BOOKMARKS] = GROUP_UI;
   SyncSession one(context_.get(), this, source_one, routes_one, workers_one);
   SyncSession two(context_.get(), this, source_two, routes_two, workers_two);
 
@@ -324,12 +323,12 @@ TEST_F(SyncSessionTest, Coalesce) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  syncable::ModelTypePayloadMap one_type =
-      syncable::ModelTypePayloadMapFromEnumSet(
+  syncer::ModelTypePayloadMap one_type =
+      syncer::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromEnumSet(
+  syncer::ModelTypePayloadMap all_types =
+      syncer::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -344,9 +343,9 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
   workers_two.push_back(passive_worker);
   workers_two.push_back(db_worker);
   workers_two.push_back(ui_worker);
-  routes_one[syncable::AUTOFILL] = GROUP_DB;
-  routes_two[syncable::AUTOFILL] = GROUP_DB;
-  routes_two[syncable::BOOKMARKS] = GROUP_UI;
+  routes_one[syncer::AUTOFILL] = GROUP_DB;
+  routes_two[syncer::AUTOFILL] = GROUP_DB;
+  routes_two[syncer::BOOKMARKS] = GROUP_UI;
   SyncSession one(context_.get(), this, source_one, routes_one, workers_one);
   SyncSession two(context_.get(), this, source_two, routes_two, workers_two);
 
@@ -385,7 +384,7 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
 
   // Make sure the model safe routing info is reduced to one type.
   ModelSafeRoutingInfo::const_iterator it =
-      two.routing_info().find(syncable::AUTOFILL);
+      two.routing_info().find(syncer::AUTOFILL);
   // Note that attempting to use EXPECT_NE would fail for an Android build due
   // to seeming incompatibility with gtest and stlport.
   EXPECT_TRUE(it != two.routing_info().end());
@@ -396,8 +395,8 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
   std::vector<ModelSafeWorker*> workers_first, workers_second;
   ModelSafeRoutingInfo routes_first, routes_second;
-  syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromEnumSet(
+  syncer::ModelTypePayloadMap all_types =
+      syncer::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_first(sync_pb::GetUpdatesCallerInfo::PERIODIC,
@@ -415,10 +414,10 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
   workers_second.push_back(passive_worker);
   workers_second.push_back(db_worker);
   workers_second.push_back(ui_worker);
-  routes_first[syncable::AUTOFILL] = GROUP_DB;
-  routes_first[syncable::BOOKMARKS] = GROUP_UI;
-  routes_second[syncable::AUTOFILL] = GROUP_DB;
-  routes_second[syncable::BOOKMARKS] = GROUP_UI;
+  routes_first[syncer::AUTOFILL] = GROUP_DB;
+  routes_first[syncer::BOOKMARKS] = GROUP_UI;
+  routes_second[syncer::AUTOFILL] = GROUP_DB;
+  routes_second[syncer::BOOKMARKS] = GROUP_UI;
   SyncSession first(context_.get(), this, source_first, routes_first,
       workers_first);
   SyncSession second(context_.get(), this, source_second, routes_second,
@@ -459,9 +458,9 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
 
   // Make sure the model safe routing info is reduced to first type.
   ModelSafeRoutingInfo::const_iterator it1 =
-      second.routing_info().find(syncable::AUTOFILL);
+      second.routing_info().find(syncer::AUTOFILL);
   ModelSafeRoutingInfo::const_iterator it2 =
-      second.routing_info().find(syncable::BOOKMARKS);
+      second.routing_info().find(syncer::BOOKMARKS);
 
   // Note that attempting to use EXPECT_NE would fail for an Android build due
   // to seeming incompatibility with gtest and stlport.
@@ -477,23 +476,23 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
 
 
 TEST_F(SyncSessionTest, MakeTypePayloadMapFromBitSet) {
-  syncable::ModelTypeSet types;
+  syncer::ModelTypeSet types;
   std::string payload = "test";
-  syncable::ModelTypePayloadMap types_with_payloads =
-      syncable::ModelTypePayloadMapFromEnumSet(types, payload);
+  syncer::ModelTypePayloadMap types_with_payloads =
+      syncer::ModelTypePayloadMapFromEnumSet(types, payload);
   EXPECT_TRUE(types_with_payloads.empty());
 
-  types.Put(syncable::BOOKMARKS);
-  types.Put(syncable::PASSWORDS);
-  types.Put(syncable::AUTOFILL);
+  types.Put(syncer::BOOKMARKS);
+  types.Put(syncer::PASSWORDS);
+  types.Put(syncer::AUTOFILL);
   payload = "test2";
   types_with_payloads =
-      syncable::ModelTypePayloadMapFromEnumSet(types, payload);
+      syncer::ModelTypePayloadMapFromEnumSet(types, payload);
 
   ASSERT_EQ(3U, types_with_payloads.size());
-  EXPECT_EQ(types_with_payloads[syncable::BOOKMARKS], payload);
-  EXPECT_EQ(types_with_payloads[syncable::PASSWORDS], payload);
-  EXPECT_EQ(types_with_payloads[syncable::AUTOFILL], payload);
+  EXPECT_EQ(types_with_payloads[syncer::BOOKMARKS], payload);
+  EXPECT_EQ(types_with_payloads[syncer::PASSWORDS], payload);
+  EXPECT_EQ(types_with_payloads[syncer::AUTOFILL], payload);
 }
 
 }  // namespace