sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

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 73 matching lines @@
 
 SyncConfigInfo::SyncConfigInfo()
     : encrypt_all(false),
       sync_everything(false),
       sync_nothing(false),
       passphrase_is_gaia(false) {
 }
 
 SyncConfigInfo::~SyncConfigInfo() {}
 
-// 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",
-  "apps",
-  "tabs"
-};
-
-COMPILE_ASSERT(32 == 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();
-       ++i, it.Inc()) {
-    type_names[it.Get()] = kDataTypeNames[i];
-  }
-  return type_names;
-}
-
 bool GetConfiguration(const std::string& json, SyncConfigInfo* config) {
   scoped_ptr<base::Value> parsed_value(base::JSONReader::Read(json));
   base::DictionaryValue* result;
   if (!parsed_value || !parsed_value->GetAsDictionary(&result)) {
     DLOG(ERROR) << "GetConfiguration() not passed a Dictionary";
     return false;
   }
 
   if (!result->GetBoolean("syncAllDataTypes", &config->sync_everything)) {
     DLOG(ERROR) << "GetConfiguration() not passed a syncAllDataTypes value";
     return false;
   }
 
   if (!result->GetBoolean("syncNothing", &config->sync_nothing)) {
     DLOG(ERROR) << "GetConfiguration() not passed a syncNothing value";
     return false;
   }
 
   DCHECK(!(config->sync_everything && config->sync_nothing))
       << "syncAllDataTypes and syncNothing cannot both be true";
 
-  ModelTypeNameMap type_names = GetSelectableTypeNameMap();
+  syncer::ModelTypeNameMap type_names = syncer::GetUserSelectableTypeNameMap();
 
-  for (ModelTypeNameMap::const_iterator it = type_names.begin();
+  for (syncer::ModelTypeNameMap::const_iterator it = type_names.begin();
        it != type_names.end(); ++it) {
     std::string key_name = it->second + std::string("Synced");
     bool sync_value;
     if (!result->GetBoolean(key_name, &sync_value)) {
       DLOG(ERROR) << "GetConfiguration() not passed a value for " << key_name;
       return false;
     }
     if (sync_value)
       config->data_types.Put(it->first);
   }
@@ skipping 105 matching lines @@
     { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES },
     { "syncNothing", IDS_SYNC_NOTHING },
     { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS },
     { "preferences", IDS_SYNC_DATATYPE_PREFERENCES },
     { "autofill", IDS_SYNC_DATATYPE_AUTOFILL },
     { "themes", IDS_SYNC_DATATYPE_THEMES },
     { "passwords", IDS_SYNC_DATATYPE_PASSWORDS },
     { "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },
     { "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },
     { "apps", IDS_SYNC_DATATYPE_APPS },
+    { "wifiCredentials", IDS_SYNC_DATATYPE_WIFI_CREDENTIALS },
     { "openTabs", IDS_SYNC_DATATYPE_TABS },
     { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
     { "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL },
     { "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR },
     { "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR },
     { "customizeLinkLabel", IDS_SYNC_CUSTOMIZE_LINK_LABEL },
     { "confirmSyncPreferences", IDS_SYNC_CONFIRM_SYNC_PREFERENCES },
     { "syncEverything", IDS_SYNC_SYNC_EVERYTHING },
     { "useDefaultSettings", IDS_SYNC_USE_DEFAULT_SETTINGS },
     { "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY },
@@ skipping 66 matching lines @@
   //       passwords)
   //   usePassphrase: true if the data is encrypted with a secondary passphrase
   //   show_passphrase: true if a passphrase is needed to decrypt the sync data
   base::DictionaryValue args;
 
   // Tell the UI layer which data types are registered/enabled by the user.
   const syncer::ModelTypeSet registered_types =
       service->GetRegisteredDataTypes();
   const syncer::ModelTypeSet preferred_types = service->GetPreferredDataTypes();
   const syncer::ModelTypeSet enforced_types = service->GetForcedDataTypes();
-  ModelTypeNameMap type_names = GetSelectableTypeNameMap();
-  for (ModelTypeNameMap::const_iterator it = type_names.begin();
+  syncer::ModelTypeNameMap type_names = syncer::GetUserSelectableTypeNameMap();
+  for (syncer::ModelTypeNameMap::const_iterator it = type_names.begin();
        it != type_names.end(); ++it) {
     syncer::ModelType sync_type = it->first;
     const std::string key_name = it->second;
     args.SetBoolean(key_name + "Registered", registered_types.Has(sync_type));
     args.SetBoolean(key_name + "Synced", preferred_types.Has(sync_type));
     args.SetBoolean(key_name + "Enforced", enforced_types.Has(sync_type));
     // TODO(treib): How do we want to handle pref groups, i.e. when only some of
     // the sync types behind a checkbox are force-enabled? crbug.com/403326
   }
   sync_driver::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
@@ skipping 586 matching lines @@
 
   LoginUIService* service = GetLoginUIService();
   DCHECK(service);
   service->current_login_ui()->FocusUI();
   return true;
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }