Refactor preference syncing.

chrome/browser/sync/abstract_profile_sync_service_test.cc

Index: chrome/browser/sync/abstract_profile_sync_service_test.cc
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc
index 355437b6502e6f73ec7a3f41ec9e4c478cccffc4..366230b5c823459a20eb1f1a467acaa4ea1b455c 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.cc
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc
@@ -5,12 +5,6 @@
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 
 #include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/glue/autofill_model_associator.h"
-#include "chrome/browser/sync/glue/autofill_profile_model_associator.h"
-#include "chrome/browser/sync/glue/password_model_associator.h"
-#include "chrome/browser/sync/glue/preference_model_associator.h"
-#include "chrome/browser/sync/glue/session_model_associator.h"
-#include "chrome/browser/sync/glue/typed_url_model_associator.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
@@ -39,27 +33,7 @@ using syncable::WriteTransaction;
 
 const std::string ProfileSyncServiceTestHelper::GetTagForType(
     ModelType model_type) {
-  switch (model_type) {
-    case syncable::AUTOFILL:
-      return browser_sync::kAutofillTag;
-    case syncable::AUTOFILL_PROFILE:
-      return browser_sync::kAutofillProfileTag;
-    case syncable::PREFERENCES:
-      return browser_sync::kPreferencesTag;
-    case syncable::PASSWORDS:
-      return browser_sync::kPasswordTag;
-    case syncable::NIGORI:
-      return browser_sync::kNigoriTag;
-    case syncable::TYPED_URLS:
-      return browser_sync::kTypedUrlTag;
-    case syncable::SESSIONS:
-      return browser_sync::kSessionsTag;
-    case syncable::BOOKMARKS:
-      return "google_chrome_bookmarks";
-    default:
-      NOTREACHED();
-  }
-  return std::string();
+  return syncable::ModelTypeToRootTag(model_type);
 }
 
 bool ProfileSyncServiceTestHelper::CreateRoot(