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

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 318 matching lines @@
 
 // Disables syncing of extensions.
 const char kDisableSyncExtensions[]         = "disable-sync-extensions";
 
 // Disables syncing browser passwords.
 const char kDisableSyncPasswords[]          = "disable-sync-passwords";
 
 // Disables syncing of preferences.
 const char kDisableSyncPreferences[]        = "disable-sync-preferences";
 
+// Disable syncing custom search engines.
+const char kDisableSyncSearchEngines[]      = "disable-sync-search-engines";
+
 // Disables syncing of themes.
 const char kDisableSyncThemes[]             = "disable-sync-themes";
 
 // Disables syncing browser typed urls.
 const char kDisableSyncTypedUrls[]           = "disable-sync-typed-urls";
 
 // TabCloseableStateWatcher disallows closing of tabs and browsers under
 // certain situations on ChromeOS. Some tests expect tabs or browsers to close,
 // so we need a switch to disable the watcher.
 const char kDisableTabCloseableStateWatcher[] =
@@ skipping 183 matching lines @@
 
 // On platforms that support it, enables smooth scroll animation.
 const char kEnableSmoothScrolling[]         = "enable-smooth-scrolling";
 
 // Enables syncing extension settings.
 const char kEnableSyncExtensionSettings[]   = "enable-sync-extension-settings";
 
 // Enables OAuth sign-in for sync.
 const char kEnableSyncOAuth[]               = "enable-sync-oauth";
 
-// Enables syncing custom search engines.
-const char kEnableSyncSearchEngines[]       = "enable-sync-search-engines";
-
 // Enables syncing browser sessions.
 const char kEnableSyncTabs[]                = "enable-sync-tabs";
 
 // Enables syncing browser sessions for other synced clients.
 const char kEnableSyncTabsForOtherClients[] =
     "enable-sync-tabs-for-other-clients";
 
 // Enable syncing app notifications.
 const char kEnableSyncAppNotifications[]    = "enable-sync-app-notifications";
 
@@ skipping 742 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches