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

chrome/browser/sync/sync_setup_flow.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/sync/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 122 matching lines @@
   args->SetBoolean("passwordsRegistered",
       registered_types.count(syncable::PASSWORDS) > 0);
   args->SetBoolean("autofillRegistered",
       registered_types.count(syncable::AUTOFILL) > 0);
   args->SetBoolean("extensionsRegistered",
       registered_types.count(syncable::EXTENSIONS) > 0);
   args->SetBoolean("typedUrlsRegistered",
       registered_types.count(syncable::TYPED_URLS) > 0);
   args->SetBoolean("appsRegistered",
       registered_types.count(syncable::APPS) > 0);
-  args->SetBoolean("searchEnginesRegistered",
-      registered_types.count(syncable::SEARCH_ENGINES) > 0);
   args->SetBoolean("sessionsRegistered",
       registered_types.count(syncable::SESSIONS) > 0);
   args->SetBoolean("syncBookmarks",
                    preferred_types.count(syncable::BOOKMARKS) > 0);
   args->SetBoolean("syncPreferences",
                    preferred_types.count(syncable::PREFERENCES) > 0);
   args->SetBoolean("syncThemes",
                    preferred_types.count(syncable::THEMES) > 0);
   args->SetBoolean("syncPasswords",
                    preferred_types.count(syncable::PASSWORDS) > 0);
   args->SetBoolean("syncAutofill",
                    preferred_types.count(syncable::AUTOFILL) > 0);
   args->SetBoolean("syncExtensions",
                    preferred_types.count(syncable::EXTENSIONS) > 0);
-  args->SetBoolean("syncSearchEngines",
-                   preferred_types.count(syncable::SEARCH_ENGINES) > 0);
   args->SetBoolean("syncSessions",
                    preferred_types.count(syncable::SESSIONS) > 0);
   args->SetBoolean("syncTypedUrls",
                    preferred_types.count(syncable::TYPED_URLS) > 0);
   args->SetBoolean("syncApps",
                    preferred_types.count(syncable::APPS) > 0);
 
   args->SetBoolean("encryptionEnabled",
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableSyncEncryption));
@@ skipping 329 matching lines @@
     }
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(
           UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }