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

chrome/browser/sync/profile_sync_factory_impl.cc

Index: chrome/browser/sync/profile_sync_factory_impl.cc
===================================================================
--- chrome/browser/sync/profile_sync_factory_impl.cc	(revision 108905)
+++ chrome/browser/sync/profile_sync_factory_impl.cc	(working copy)
@@ -153,6 +153,13 @@
         new TypedUrlDataTypeController(this, profile_));
   }
 
+  // Search Engine sync is enabled by default.  Register only if explicitly
+  // disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncSearchEngines)) {
+    pss->RegisterDataTypeController(
+        new SearchEngineDataTypeController(this, profile_, pss));
+  }
+
   // Session sync is disabled by default.  Register only if explicitly
   // enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncTabs)) {
@@ -176,13 +183,6 @@
         new AutofillProfileDataTypeController(this, profile_));
   }
 
-  // Search Engine sync is disabled by default.  Register only if explicitly
-  // enabled.
-  if (command_line_->HasSwitch(switches::kEnableSyncSearchEngines)) {
-    pss->RegisterDataTypeController(
-        new SearchEngineDataTypeController(this, profile_, pss));
-  }
-
   // App notifications sync is disabled by default.  Register only if
   // explicitly enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncAppNotifications)) {