Support for multiple sync ModelSafeWorkers....

chrome/browser/sync/engine/syncer_util.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/sync/engine/syncer_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 258 matching lines @@
   CHECK(local_entry->Get(ID) == server_entry.id())
       << "ID Changing not supported here";
   local_entry->Put(SERVER_PARENT_ID, server_entry.parent_id());
   local_entry->Put(SERVER_NON_UNIQUE_NAME, name);
   local_entry->Put(SERVER_VERSION, server_entry.version());
   local_entry->Put(SERVER_CTIME,
       ServerTimeToClientTime(server_entry.ctime()));
   local_entry->Put(SERVER_MTIME,
       ServerTimeToClientTime(server_entry.mtime()));
   local_entry->Put(SERVER_IS_BOOKMARK_OBJECT,
-      GetSyncDataType(server_entry) == SYNC_TYPE_BOOKMARK);
+      GetModelType(server_entry) == syncable::BOOKMARKS);
   local_entry->Put(SERVER_IS_DIR, server_entry.IsFolder());
   if (server_entry.has_singleton_tag()) {
     const string& tag = server_entry.singleton_tag();
     local_entry->Put(SINGLETON_TAG, tag);
   }
   if (!server_entry.deleted()) {
     if (server_entry.specifics().HasExtension(sync_pb::bookmark)) {
       // New style bookmark data.
       const sync_pb::BookmarkSpecifics& bookmark =
           server_entry.specifics().GetExtension(sync_pb::bookmark);
@@ skipping 470 matching lines @@
     }
 
     // |update_entry| is considered to be somewhere after |candidate|, so store
     // it as the upper bound.
     closest_sibling = candidate.Get(ID);
   }
 
   return closest_sibling;
 }
 
-browser_sync::SyncDataType SyncerUtil::GetSyncDataType(
+syncable::ModelType SyncerUtil::GetModelType(
     const SyncEntity& entry) {
 
   const bool is_bookmark =
       (entry.has_specifics() &&
        entry.specifics().HasExtension(sync_pb::bookmark)) ||
        entry.has_bookmarkdata();
 
   if (is_bookmark) {
-    return SYNC_TYPE_BOOKMARK;
+    return syncable::BOOKMARKS;
   }
 
-  return SYNC_TYPE_UNKNOWN;
+  return syncable::UNSPECIFIED;
 }
 
 }  // namespace browser_sync