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

chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stack>
 #include <vector>
@@ skipping 49 matching lines @@
                                 error_handler,
                                 true /* expect_mobile_bookmarks_folder */),
         user_share_(user_share) {}
 
   // TODO(akalin): This logic lazily creates any tagged node that is
   // requested.  A better way would be to have utility functions to
   // create sync nodes from some bookmark structure and to use that.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id) {
     std::string tag_str = std::string(tag.c_str(), tag.length());
     bool root_exists = false;
-    syncable::ModelType type = model_type();
+    syncer::ModelType type = model_type();
     {
       syncer::WriteTransaction trans(FROM_HERE, user_share_);
       syncer::ReadNode uber_root(&trans);
       uber_root.InitByRootLookup();
 
       syncer::ReadNode root(&trans);
       root_exists = root.InitByTagLookup(
           ProfileSyncServiceTestHelper::GetTagForType(type)) ==
               BaseNode::INIT_OK;
     }
@@ skipping 67 matching lines @@
   // Pretend that the server told the syncer to add a bookmark object.
   int64 Add(const std::wstring& title,
             const std::string& url,
             bool is_folder,
             int64 parent_id,
             int64 predecessor_id) {
     syncer::ReadNode parent(trans_);
     EXPECT_EQ(BaseNode::INIT_OK, parent.InitByIdLookup(parent_id));
     syncer::WriteNode node(trans_);
     if (predecessor_id == 0) {
-      EXPECT_TRUE(node.InitByCreation(syncable::BOOKMARKS, parent, NULL));
+      EXPECT_TRUE(node.InitByCreation(syncer::BOOKMARKS, parent, NULL));
     } else {
       syncer::ReadNode predecessor(trans_);
       EXPECT_EQ(BaseNode::INIT_OK, predecessor.InitByIdLookup(predecessor_id));
       EXPECT_EQ(predecessor.GetParentId(), parent.GetId());
-      EXPECT_TRUE(node.InitByCreation(syncable::BOOKMARKS, parent,
+      EXPECT_TRUE(node.InitByCreation(syncer::BOOKMARKS, parent,
                                       &predecessor));
     }
     EXPECT_EQ(node.GetPredecessorId(), predecessor_id);
     EXPECT_EQ(node.GetParentId(), parent_id);
     node.SetIsFolder(is_folder);
     node.SetTitle(title);
     if (!is_folder)
       node.SetURL(GURL(url));
     syncer::ChangeRecord record;
     record.action = syncer::ChangeRecord::ACTION_ADD;
@@ skipping 1317 matching lines @@
   EXPECT_EQ(1, observer.get_started());
   EXPECT_EQ(0, observer.get_completed_count_at_started());
   EXPECT_EQ(1, observer.get_completed());
 
   model_->RemoveObserver(&observer);
 }
 
 }  // namespace
 
 }  // namespace browser_sync