Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/browser/ui/webui/options/personal_options_handler.cc

 // Copyright (c) 2011 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/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 174 matching lines @@
   localized_strings->SetString("syncpasswords",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_PASSWORDS));
   localized_strings->SetString("syncextensions",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_EXTENSIONS));
   localized_strings->SetString("syncautofill",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_AUTOFILL));
   localized_strings->SetString("syncthemes",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_THEMES));
   localized_strings->SetString("syncapps",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_APPS));
-  localized_strings->SetString("syncsearchengines",
-      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SEARCH_ENGINES));
   localized_strings->SetString("syncsessions",
       l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_TABS));
 
 #if defined(OS_CHROMEOS)
   localized_strings->SetString("account",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME));
   localized_strings->SetString("enableScreenlock",
       l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
   localized_strings->SetString("changePicture",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE));
@@ skipping 212 matching lines @@
     profile_info_list.Append(profile_value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }