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 84 matching lines @@
 // the respective types in ModelType
 const char* kDataTypeNames[] = {
   "bookmarks",
   "preferences",
   "passwords",
   "autofill",
   "themes",
   "typedUrls",
   "extensions",
   "apps",
-  "tabs"
+  "wifiCredentials",
+  "tabs",
 };
 
-COMPILE_ASSERT(32 == syncer::MODEL_TYPE_COUNT,
+COMPILE_ASSERT(33 == 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;
 }

[Roger Tawa OOO till Jul 10th, 2014/10/29 13:55:03]

Seems like this function should be moved to model_type.h|cc.

[mukesh agrawal, 2014/10/29 18:17:11]

Done.

 
 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)) {
@@ skipping 130 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 674 matching lines @@
 
   LoginUIService* service = GetLoginUIService();
   DCHECK(service);
   service->current_login_ui()->FocusUI();
   return true;
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }