Add four new sync integration tests for custom search engines.

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 68 matching lines @@
 
 bool ServiceMatchesVerifier(int profile) {
   TemplateURLService* verifier = GetVerifierService();
   TemplateURLService* other = GetServiceForProfile(profile);
 
   CHECK(verifier);
   CHECK(other);
 
   std::vector<const TemplateURL*> verifier_turls = verifier->GetTemplateURLs();
   if (verifier_turls.size() != other->GetTemplateURLs().size()) {
-    LOG(ERROR) << "verifier and other service have a different count of TURLs: "
+    LOG(ERROR) << "Verifier and other service have a different count of TURLs: "
                << verifier_turls.size() << " vs "
                << other->GetTemplateURLs().size() << " respectively.";
     return false;
   }
 
   for (size_t i = 0; i < verifier_turls.size(); ++i) {
     const TemplateURL* verifier_turl = verifier_turls.at(i);
     CHECK(verifier_turl);
     const TemplateURL* other_turl = other->GetTemplateURLForKeyword(
         verifier_turl->keyword());
@@ skipping 49 matching lines @@
   } else {
     LOG(INFO) << "A had default with URL: " << default_a->url()->url()
               << " and keyword: " << default_a->keyword();
   }
 
   return true;
 }
 
 bool AllServicesMatch() {
   // Use 0 as the baseline.
-  if (!ServiceMatchesVerifier(0))
+  if (test()->use_verifier() && !ServiceMatchesVerifier(0)) {
+    LOG(ERROR) << "TemplateURLService 0 does not match verifier.";
     return false;
+  }
 
   for (int it = 0; it < test()->num_clients(); ++it) {

[Raghu Simha, 2011/11/16 19:44:43]

|it| can be initialized to 1, since there's no point in comparing Profile 0 with
itself.

[SteveT, 2011/11/16 21:25:38]

Done.

     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
@@ skipping 61 matching lines @@
   }
 }
 
 void DeleteSearchEngineBySeed(int profile, int seed) {
   DeleteSearchEngineByKeyword(profile, CreateKeyword(seed));
 }
 
 void ChangeDefaultSearchProvider(int profile, int seed) {
   TemplateURLService* service = GetServiceForProfile(profile);
   ASSERT_TRUE(service);
-  const TemplateURL* new_default = service->GetTemplateURLForKeyword(
+  const TemplateURL* turl = service->GetTemplateURLForKeyword(
       CreateKeyword(seed));
-  ASSERT_TRUE(new_default);
-  service->SetDefaultSearchProvider(new_default);
+  ASSERT_TRUE(turl);
+  service->SetDefaultSearchProvider(turl);
   if (test()->use_verifier()) {
-    new_default = GetVerifierService()->GetTemplateURLForKeyword(
-        CreateKeyword(seed));
-    ASSERT_TRUE(new_default);
-    GetVerifierService()->SetDefaultSearchProvider(new_default);
+    const TemplateURL* verifier_turl =
+        GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed));
+    ASSERT_TRUE(verifier_turl);
+    GetVerifierService()->SetDefaultSearchProvider(verifier_turl);
   }
 }
 
 }  // namespace search_engines_helper