sync: Introduce control data types

chrome/browser/sync/sync_prefs.cc

Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 2ba2dd959c8e702b95e05e6b0b1606580a5ac6a3..1eb4bc49d4529f8bd6145bbea8aaa42f5ab801ec 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -340,8 +340,8 @@ void SyncPrefs::RegisterPreferences() {
   RegisterDataTypePreferredPref(syncer::BOOKMARKS, true);
   for (int i = syncer::PREFERENCES; i < syncer::MODEL_TYPE_COUNT; ++i) {
     const syncer::ModelType type = syncer::ModelTypeFromInt(i);
-    // Also treat nigori specially.
-    if (type == syncer::NIGORI) {
+    // Control types are not user-selectable.
+    if (IsControlType(type)) {

[Nicolas Zea, 2012/08/16 20:55:02]

nit: remove curly brace around single line if

[rlarocque, 2012/08/17 19:47:18]

OK... normally I'd just follow the file's existing format, but that's not an
option here.  There are instances of one-line if statements with and without
braces in this file.

Is there a preference against using braces when they're not necessary? 

       continue;
     }
     RegisterDataTypePreferredPref(type, enable_by_default);