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

chrome/browser/sync/sync_setup_wizard_unittest.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_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 295 matching lines @@
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   wizard_->Step(SyncSetupWizard::CONFIGURE);
 
   ListValue data_type_choices_value;
   std::string data_type_choices =
       "{\"syncAllDataTypes\":false,\"syncBookmarks\":true,"
       "\"syncPreferences\":true,\"syncThemes\":false,\"syncPasswords\":false,"
       "\"syncAutofill\":false,\"syncExtensions\":false,\"syncTypedUrls\":true,"
-      "\"syncApps\":true,\"syncSearchEngines\":false,\"syncSessions\":false,"
-      "\"usePassphrase\":false,\"encryptAllData\":false}";
+      "\"syncApps\":true,\"syncSessions\":false,\"usePassphrase\":false,"
+      "\"encryptAllData\":false}";
   data_type_choices_value.Append(new StringValue(data_type_choices));
 
   // Simulate the user choosing data types; bookmarks, prefs, typed URLS, and
   // apps are on, the rest are off.
   handler_.HandleConfigure(&data_type_choices_value);
   // Since we don't need a passphrase, wizard should have transitioned to
   // DONE state and closed the UI.
   EXPECT_FALSE(wizard_->IsVisible());
   EXPECT_FALSE(service_->keep_everything_synced_);
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::BOOKMARKS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::PREFERENCES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::THEMES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::PASSWORDS));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::AUTOFILL));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::EXTENSIONS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::TYPED_URLS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::APPS));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::SEARCH_ENGINES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(
       syncable::APP_NOTIFICATIONS));
 }
 
 TEST_F(SyncSetupWizardTest, EnterPassphraseRequired) {
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   wizard_->Step(SyncSetupWizard::CONFIGURE);
   wizard_->Step(SyncSetupWizard::SETTING_UP);
@@ skipping 213 matching lines @@
 
   service_->set_last_auth_error(
       AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
   wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   CloseSetupUI();
   EXPECT_FALSE(wizard_->IsVisible());
 }