Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

sync/syncable/model_type.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.
 
 #include "sync/internal_api/public/base/model_type.h"
 
 #include "base/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 311 matching lines @@
   // bitset value here at compile time, rather than performing an iteration
   // every time.
   for (int i = FIRST_USER_MODEL_TYPE; i <= LAST_USER_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
   return set;
 }
 
 ModelTypeSet UserSelectableTypes() {
   ModelTypeSet set;
-  set.Put(APPS);
+  // Although the order doesn't technically matter here, it's clearer to keep
+  // these in the same order as their definition in the ModelType enum.
+  set.Put(BOOKMARKS);
+  set.Put(PREFERENCES);;
+  set.Put(PASSWORDS);
   set.Put(AUTOFILL);
-  set.Put(BOOKMARKS);
-  set.Put(EXTENSIONS);
-  set.Put(PASSWORDS);
-  set.Put(PREFERENCES);
-  set.Put(SESSIONS);
   set.Put(THEMES);
   set.Put(TYPED_URLS);
+  set.Put(EXTENSIONS);
+  set.Put(APPS);
+  set.Put(PROXY_TABS);
   return set;
 }
 
 bool IsUserSelectableType(ModelType model_type) {
   return UserSelectableTypes().Has(model_type);
 }
 
 ModelTypeSet EncryptableUserTypes() {
   ModelTypeSet encryptable_user_types = UserTypes();
   // We never encrypt history delete directives.
@@ skipping 17 matching lines @@
   }
 
   // TODO(albertb): Re-enable this when the server supports it.
   set.Remove(PRIORITY_PREFERENCES);
 
   return set;
 }
 
 ModelTypeSet ProxyTypes() {
   ModelTypeSet set;
-  // TODO(zea): add a TABS type here.
+  set.Put(PROXY_TABS);
   return set;
 }
 
 bool IsControlType(ModelType model_type) {
   return ControlTypes().Has(model_type);
 }
 
 const char* ModelTypeToString(ModelType model_type) {
   // This is used in serialization routines as well as for displaying debug
   // information.  Do not attempt to change these string values unless you know
@@ skipping 42 matching lines @@
     case EXPERIMENTS:
       return "Experiments";
     case PRIORITY_PREFERENCES:
       return "Priority Preferences";
     case DICTIONARY:
       return "Dictionary";
     case FAVICON_IMAGES:
       return "Favicon Images";
     case FAVICON_TRACKING:
       return "Favicon Tracking";
+    case PROXY_TABS:
+      return "Tabs";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 base::StringValue* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return new base::StringValue(ModelTypeToString(model_type));
@@ skipping 61 matching lines @@
   else if (model_type_string == "Experiments")
     return EXPERIMENTS;
   else if (model_type_string == "Priority Preferences")
     return PRIORITY_PREFERENCES;
   else if (model_type_string == "Dictionary")
     return DICTIONARY;
   else if (model_type_string == "Favicon Images")
     return FAVICON_IMAGES;
   else if (model_type_string == "Favicon Tracking")
     return FAVICON_TRACKING;
+  else if (model_type_string == "Tabs")
+    return PROXY_TABS;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
   return UNSPECIFIED;
 }
 
 std::string ModelTypeSetToString(ModelTypeSet model_types) {
   std::string result;
   for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
     if (!result.empty()) {
@@ skipping 66 matching lines @@
     case EXPERIMENTS:
       return "google_chrome_experiments";
     case PRIORITY_PREFERENCES:
       return "google_chrome_priority_preferences";
     case DICTIONARY:
       return "google_chrome_dictionary";
     case FAVICON_IMAGES:
       return "google_chrome_favicon_images";
     case FAVICON_TRACKING:
       return "google_chrome_favicon_tracking";
+    case PROXY_TABS:
+      return std::string();
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 // TODO(akalin): Figure out a better way to do these mappings.
 // Note: Do not include proxy types in this list. They should never receive
 // or trigger notifications.
@@ skipping 181 matching lines @@
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 bool IsActOnceDataType(ModelType model_type) {
   return model_type == HISTORY_DELETE_DIRECTIVES;
 }
 
 }  // namespace syncer