More misc. cleanups to minimize future refactoring diffs.

chrome/browser/sync/test/integration/search_engines_helper.cc

 // Copyright (c) 2012 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 36 matching lines @@
 
 std::string GetTURLInfoString(const TemplateURL* turl) {
   DCHECK(turl);
   return "TemplateURL: shortname: " + UTF16ToASCII(turl->short_name()) +
       " keyword: " + UTF16ToASCII(turl->keyword()) + " url: " + turl->url();
 }
 
 bool TURLsMatch(const TemplateURL* turl1, const TemplateURL* turl2) {
   CHECK(turl1);
   CHECK(turl2);
-
   bool result = (turl1->url() == turl2->url()) &&
       (turl1->keyword() == turl2->keyword()) &&
       (turl1->short_name() == turl2->short_name());
 
   // Print some useful debug info.
   if (!result) {
     LOG(ERROR) << "TemplateURLs did not match: " << GetTURLInfoString(turl1)
                << " vs " << GetTURLInfoString(turl2);
   }
 
@@ skipping 113 matching lines @@
       base::StringPrintf("http://www.test%d.com/", seed), sync_guid);
 }
 
 TemplateURL* CreateTestTemplateURL(int seed,
                                    const string16& keyword,
                                    const std::string& url,
                                    const std::string& sync_guid) {
   TemplateURLData data;
   data.short_name = CreateKeyword(seed);
   data.SetKeyword(keyword);
-  data.safe_for_autoreplace = true;
   data.SetURL(url);
   data.favicon_url = GURL("http://favicon.url");
+  data.safe_for_autoreplace = true;
   data.date_created = base::Time::FromTimeT(100);
   data.last_modified = base::Time::FromTimeT(100);
   data.prepopulate_id = 999999;
   data.sync_guid = sync_guid;
   return new TemplateURL(data);
 }
 
 void AddSearchEngine(int profile, int seed) {
   GetServiceForProfile(profile)->Add(CreateTestTemplateURL(seed));
   if (test()->use_verifier())
@@ skipping 49 matching lines @@
   service->SetDefaultSearchProvider(turl);
   if (test()->use_verifier()) {
     const TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed));
     ASSERT_TRUE(verifier_turl);
     GetVerifierService()->SetDefaultSearchProvider(verifier_turl);
   }
 }
 
 }  // namespace search_engines_helper