Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

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 29 matching lines @@
     CHECK(*it);
     CHECK(map.find((*it)->sync_guid()) == map.end());
     map[(*it)->sync_guid()] = *it;
   }
 
   return map;
 }
 
 std::string GetTURLInfoString(const TemplateURL* turl) {
   DCHECK(turl);
-  std::string shortname = UTF16ToASCII(turl->short_name());
-  std::string keyword = UTF16ToASCII(turl->keyword());
-  return StringPrintf("TemplateURL: shortname: %s keyword: %s url: %s",
-      shortname.c_str(), keyword.c_str(),
-      (turl->url() ? turl->url()->url().c_str() : "NULL"));
+  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);
 
-  // Either both TemplateURLRefs are NULL or they're both valid and have the
-  // same raw URL value.
-  bool urls_match = ((!turl1->url() && !turl1->url()) ||
-      (turl1->url() && turl2->url() &&
-      turl1->url()->url() == turl2->url()->url()));
-
-  // Compare all major fields.
-  bool result = (urls_match && turl1->keyword() == turl2->keyword() &&
-                 turl1->short_name() == turl2->short_name());
+  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);
   }
 
   return result;
 }
 
@@ skipping 61 matching lines @@
   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()
+    LOG(INFO) << "A had default with URL: " << default_a->url()
               << " and keyword: " << default_a->keyword();
   }
 
   return true;
 }
 
 bool AllServicesMatch() {
   // Use 0 as the baseline.
   if (test()->use_verifier() && !ServiceMatchesVerifier(0)) {
     LOG(ERROR) << "TemplateURLService 0 does not match verifier.";
@@ skipping 100 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