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

chrome/browser/sync/test/integration/search_engines_helper.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/test/integration/search_engines_helper.h"
 
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 119 matching lines @@
   for (GUIDToTURLMap::iterator it = a_turls.begin();
        it != a_turls.end(); ++it) {
     if (b_turls.find(it->first) == b_turls.end()) {
       LOG(ERROR) << "TURL GUID from a not found in b's TURLs: " << it->first;
       return false;
     }
     if (!TURLsMatch(b_turls[it->first], it->second))
       return false;
   }
 
+  const TemplateURL* default_a = service_a->GetDefaultSearchProvider();
+  const TemplateURL* default_b = service_b->GetDefaultSearchProvider();
+  CHECK(default_a);
+  CHECK(default_b);
+  if (!TURLsMatch(default_a, default_b)) {
+    LOG(ERROR) << "Default search providers do not match: A's default: "
+               << default_a->keyword() << " B's default: "
+               << default_b->keyword();
+    return false;
+  } else {
+    LOG(INFO) << "A had default with URL: " << default_a->url()->url()

[Raghu Simha, 2011/11/07 22:18:12]

Is url()->url() a typo or do you need to go that deep to get the actual URL
string?

[SteveT, 2011/11/08 00:17:27]

Yeah, I want to print the URL itself. This output is just for diagnostics.

+              << " and keyword: " << default_a->keyword();
+  }
+
   return true;
 }
 
 bool AllServicesMatch() {
   // Use 0 as the baseline.
   if (!ServiceMatchesVerifier(0))
     return false;
 
   for (int it = 0; it < test()->num_clients(); ++it) {
     if (!ServicesMatch(0, it)) {
       LOG(ERROR) << "TemplateURLService " << it << " does not match with "
                  << "service 0.";
       return false;
     }
   }
   return true;
 }
 
+// Convenience helper for consistently generating the same keyword for a given
+// seed.
+string16 CreateKeyword(int seed) {
+  return ASCIIToUTF16(base::StringPrintf("test%d", seed));
+}
+
 TemplateURL* CreateTestTemplateURL(int seed) {
   TemplateURL* turl = new TemplateURL();
   turl->SetURL(base::StringPrintf("http://www.test%d.com/", seed), 0, 0);
-  turl->set_keyword(ASCIIToUTF16(base::StringPrintf("test%d", seed)));
+  turl->set_keyword(CreateKeyword(seed));
   turl->set_short_name(ASCIIToUTF16(base::StringPrintf("test%d", seed)));
   turl->set_safe_for_autoreplace(true);
   GURL favicon_url("http://favicon.url");
   turl->SetFaviconURL(favicon_url);
   turl->set_date_created(base::Time::FromTimeT(100));
   turl->set_last_modified(base::Time::FromTimeT(100));
   turl->SetPrepopulateId(999999);
   turl->set_sync_guid(base::StringPrintf("0000-0000-0000-%04d", seed));
   return turl;
 }
@@ skipping 21 matching lines @@
     const TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(ASCIIToUTF16(keyword));
     EXPECT_TRUE(verifier_turl);
     GetVerifierService()->ResetTemplateURL(verifier_turl,
                                            ASCIIToUTF16(short_name),
                                            ASCIIToUTF16(new_keyword),
                                            url);
   }
 }
 
-void DeleteSearchEngine(int profile, const std::string& keyword) {
+void DeleteSearchEngine(int profile, const string16 keyword) {
   const TemplateURL* turl = GetServiceForProfile(profile)->
-      GetTemplateURLForKeyword(ASCIIToUTF16(keyword));
+      GetTemplateURLForKeyword(keyword);
   EXPECT_TRUE(turl);
   GetServiceForProfile(profile)->Remove(turl);
   // Make sure we do the same on the verifier.
   if (test()->use_verifier()) {
     const TemplateURL* verifier_turl =
-        GetVerifierService()->GetTemplateURLForKeyword(ASCIIToUTF16(keyword));
+        GetVerifierService()->GetTemplateURLForKeyword(keyword);
     EXPECT_TRUE(verifier_turl);
     GetVerifierService()->Remove(verifier_turl);
   }
 }
 
+void DeleteSearchEngineBySeed(int profile, int seed) {
+  DeleteSearchEngine(profile, CreateKeyword(seed));
+}
+
+void ChangeDefaultSearchProvider(int profile, int seed) {
+  TemplateURLService* service = GetServiceForProfile(profile);
+  ASSERT_TRUE(service);
+  const TemplateURL* new_default = service->GetTemplateURLForKeyword(
+      CreateKeyword(seed));
+  ASSERT_TRUE(new_default);
+  service->SetDefaultSearchProvider(new_default);
+  if (test()->use_verifier()) {
+    new_default = GetVerifierService()->GetTemplateURLForKeyword(
+        CreateKeyword(seed));
+    ASSERT_TRUE(new_default);
+    GetVerifierService()->SetDefaultSearchProvider(new_default);
+  }
+}
+
 }  // namespace search_engines_helper