Revert 182527

Caused compile failure on Win Aura

> [Sync] Make SESSIONS an implicit type
> 
> We add TABS as a new local type, which is now what is enabled via the user
> settings. It implicitly enables SESSIONS.
> 
> Similarly, History now corresponds with Typed URLs, which implicitly enables 
> history delete directives if the proper command line flag is passed.
> 
> Finally, History delete directives implicitly enables SESSIONS, which we can do
> because Sessions is no longer a user selectable type.
> 
> BUG=170162
> TBR=jhawkins@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/11961030

TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/12271002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182529 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 7 deletions

diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index 2bdb7cb..0847810 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -341,7 +341,7 @@ ModelTypeSet ControlTypes() {
 
 ModelTypeSet ProxyTypes() {
   ModelTypeSet set;
-  set.Put(PROXY_TABS);
+  // TODO(zea): add a TABS type here.
   return set;
 }
 
@@ -400,8 +400,6 @@ const char* ModelTypeToString(ModelType model_type) {
       return "Priority Preferences";
     case DICTIONARY:
       return "Dictionary";
-    case PROXY_TABS:
-      return "Tabs";
     default:
       break;
   }
@@ -479,8 +477,6 @@ ModelType ModelTypeFromString(const std::string& model_type_string) {
     return PRIORITY_PREFERENCES;
   else if (model_type_string == "Dictionary")
     return DICTIONARY;
-  else if (model_type_string == "Tabs")
-    return PROXY_TABS;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
@@ -563,8 +559,6 @@ std::string ModelTypeToRootTag(ModelType type) {
       return "google_chrome_priority_preferences";
     case DICTIONARY:
       return "google_chrome_dictionary";
-    case PROXY_TABS:
-      return std::string();
     default:
       break;
   }