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

chrome/browser/ui/webui/sync_setup_handler.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 "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 65 matching lines @@
 // Note: The order of these types must match the ordering of
 // the respective types in ModelType
 const char* kDataTypeNames[] = {
   "bookmarks",
   "preferences",
   "passwords",
   "autofill",
   "themes",
   "typedUrls",
   "extensions",
-  "sessions",
-  "apps"
+  "apps",
+  "tabs"
 };
 
-COMPILE_ASSERT(25 == syncer::MODEL_TYPE_COUNT,
+COMPILE_ASSERT(26 == syncer::MODEL_TYPE_COUNT,
                update_kDataTypeNames_to_match_UserSelectableTypes);
 
 typedef std::map<syncer::ModelType, const char*> ModelTypeNameMap;
 
 ModelTypeNameMap GetSelectableTypeNameMap() {
   ModelTypeNameMap type_names;
   syncer::ModelTypeSet type_set = syncer::UserSelectableTypes();
   syncer::ModelTypeSet::Iterator it = type_set.First();
   DCHECK_EQ(arraysize(kDataTypeNames), type_set.Size());
   for (size_t i = 0; i < arraysize(kDataTypeNames) && it.Good();
@@ skipping 1219 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }