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

chrome/browser/sync/test/integration/two_client_search_engines_sync_test.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 "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using search_engines_helper::AddSearchEngine;
 using search_engines_helper::AllServicesMatch;
+using search_engines_helper::ChangeDefaultSearchProvider;
 using search_engines_helper::CreateTestTemplateURL;
-using search_engines_helper::DeleteSearchEngine;
+using search_engines_helper::DeleteSearchEngineByKeyword;
+using search_engines_helper::DeleteSearchEngineBySeed;
 using search_engines_helper::EditSearchEngine;
 using search_engines_helper::GetServiceForProfile;
 using search_engines_helper::GetVerifierService;
 using search_engines_helper::ServiceMatchesVerifier;
 
 class TwoClientSearchEnginesSyncTest : public SyncTest {
  public:
   TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientSearchEnginesSyncTest() {}
 
@@ skipping 64 matching lines @@
 // TCM ID - 8898660.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, Delete) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllServicesMatch());
 
   AddSearchEngine(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
-  DeleteSearchEngine(0, "test0");
+  DeleteSearchEngineBySeed(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 }
 
 // TCM ID - 8906436.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllServicesMatch());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
   AddSearchEngine(0, 0);
   ASSERT_TRUE(
       GetClient(0)->AwaitFullSyncCompletion("Added a search engine."));
   ASSERT_TRUE(ServiceMatchesVerifier(0));
   ASSERT_FALSE(ServiceMatchesVerifier(1));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllServicesMatch());
 }
+
+// TCM ID - 8891809.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, SyncDefault) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  AddSearchEngine(0, 0);
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  // Change the default to the new search engine, sync, and ensure that it
+  // changed in the second client. AllServicesMatch does a default search
+  // provider check.
+  ChangeDefaultSearchProvider(0, 0);
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  ASSERT_TRUE(AllServicesMatch());
+}
+
+// Ensure that we can change the search engine and immediately delete it
+// without putting the clients out of sync.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DeleteSyncedDefault) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  AddSearchEngine(0, 0);
+  AddSearchEngine(0, 1);
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  ChangeDefaultSearchProvider(0, 0);
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+
+  // Change the default on the first client and delete the old default.
+  ChangeDefaultSearchProvider(0, 1);
+  DeleteSearchEngineBySeed(0, 0);
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  ASSERT_TRUE(AllServicesMatch());
+}