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

chrome/browser/ui/webui/sync_setup_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/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 107 matching lines @@
     return false;
   if (sync_extensions)
     config->data_types.insert(syncable::EXTENSIONS);
 
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
     config->data_types.insert(syncable::TYPED_URLS);
 
-  bool sync_search_engines;
-  if (!result->GetBoolean("syncSearchEngines", &sync_search_engines))
-    return false;
-  if (sync_search_engines)
-    config->data_types.insert(syncable::SEARCH_ENGINES);
-
   bool sync_sessions;
   if (!result->GetBoolean("syncSessions", &sync_sessions))
     return false;
   if (sync_sessions)
     config->data_types.insert(syncable::SESSIONS);
 
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
   if (sync_apps)
@@ skipping 59 matching lines @@
       ((types.find(syncable::THEMES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncThemes)) ||
       ((types.find(syncable::PASSWORDS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncPasswords)) ||
       ((types.find(syncable::AUTOFILL) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncAutofill)) ||
       ((types.find(syncable::EXTENSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncExtensions)) ||
       ((types.find(syncable::TYPED_URLS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
-      ((types.find(syncable::SEARCH_ENGINES) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncSearchEngines)) ||
       ((types.find(syncable::SESSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncSessions)) ||
       ((types.find(syncable::APPS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncApps)))
     return true;
 
   return false;
 }
 
 bool GetPassphrase(const std::string& json, std::string* passphrase) {
@@ skipping 109 matching lines @@
     { "syncAllDataTypes", IDS_SYNC_EVERYTHING },
     { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES },
     { "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 },
-    { "searchEngines", IDS_SYNC_DATATYPE_SEARCH_ENGINES },
     { "openTabs", IDS_SYNC_DATATYPE_TABS },
     { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
     { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
     { "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL },
     { "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE },
     { "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT },
     { "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE },
     { "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT },
     { "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL },
     { "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL },
@@ skipping 232 matching lines @@
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncThemes",
           types.find(syncable::THEMES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPasswords",
           types.find(syncable::PASSWORDS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAutofill",
           types.find(syncable::AUTOFILL) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensions",
           types.find(syncable::EXTENSIONS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncTypedUrls",
           types.find(syncable::TYPED_URLS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSearchEngines",
-          types.find(syncable::SEARCH_ENGINES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSessions",
           types.find(syncable::SESSIONS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncApps",
           types.find(syncable::APPS) != types.end());
       COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
                      UpdateCustomConfigHistogram);
     }
     UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
     UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
                           configuration.set_gaia_passphrase ||
@@ skipping 142 matching lines @@
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }