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

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/search_provider_unittest.cc	(revision 130285)
+++ chrome/browser/autocomplete/search_provider_unittest.cc	(working copy)
@@ -199,7 +199,7 @@
     return;
   ASSERT_GE(provider_->matches().size(), 1u);
   EXPECT_TRUE(FindMatchWithDestination(GURL(
-    default_t_url_->url()->ReplaceSearchTerms(text,
+    default_t_url_->url_ref().ReplaceSearchTerms(text,
         TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())), wyt_match));
 }
 
@@ -215,7 +215,7 @@
                                             int visit_count) {
   HistoryService* history =
       profile_.GetHistoryService(Profile::EXPLICIT_ACCESS);
-  GURL search(t_url->url()->ReplaceSearchTerms(term,
+  GURL search(t_url->url_ref().ReplaceSearchTerms(term,
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   static base::Time last_added_time;
   last_added_time = std::max(base::Time::Now(),
@@ -262,7 +262,7 @@
   ASSERT_TRUE(fetcher);
 
   // And the URL matches what we expected.
-  GURL expected_url(default_t_url_->suggestions_url()->ReplaceSearchTerms(
+  GURL expected_url(default_t_url_->suggestions_url_ref().ReplaceSearchTerms(
       term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   ASSERT_TRUE(fetcher->GetOriginalURL() == expected_url);
 
@@ -283,7 +283,7 @@
 
   AutocompleteMatch wyt_match;
   EXPECT_TRUE(FindMatchWithDestination(
-      GURL(default_t_url_->url()->ReplaceSearchTerms(term,
+      GURL(default_t_url_->url_ref().ReplaceSearchTerms(term,
           TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())), &wyt_match));
   EXPECT_TRUE(wyt_match.description.empty());
 
@@ -322,7 +322,7 @@
   ASSERT_TRUE(keyword_fetcher);
 
   // And the URL matches what we expected.
-  GURL expected_url(keyword_t_url_->suggestions_url()->ReplaceSearchTerms(
+  GURL expected_url(keyword_t_url_->suggestions_url_ref().ReplaceSearchTerms(
       term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   ASSERT_TRUE(keyword_fetcher->GetOriginalURL() == expected_url);
 
@@ -391,7 +391,7 @@
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url(default_t_url_->url()->ReplaceSearchTerms(
+  GURL instant_url(default_t_url_->url_ref().ReplaceSearchTerms(
       ASCIIToUTF16("foobar"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
       string16()));
   AutocompleteMatch instant_match;
@@ -403,7 +403,7 @@
   // Make sure the what you typed match has no description.
   AutocompleteMatch wyt_match;
   EXPECT_TRUE(FindMatchWithDestination(
-      GURL(default_t_url_->url()->ReplaceSearchTerms(ASCIIToUTF16("foo"),
+      GURL(default_t_url_->url_ref().ReplaceSearchTerms(ASCIIToUTF16("foo"),
           TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())), &wyt_match));
   EXPECT_TRUE(wyt_match.description.empty());
 
@@ -425,7 +425,7 @@
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url(default_t_url_->url()->ReplaceSearchTerms(
+  GURL instant_url(default_t_url_->url_ref().ReplaceSearchTerms(
       ASCIIToUTF16("foobar"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
       string16()));
   AutocompleteMatch instant_match;