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

chrome/browser/search_engines/template_url_fetcher.cc

Index: chrome/browser/search_engines/template_url_fetcher.cc
===================================================================
--- chrome/browser/search_engines/template_url_fetcher.cc	(revision 130285)
+++ chrome/browser/search_engines/template_url_fetcher.cc	(working copy)
@@ -149,7 +149,7 @@
 
   template_url_.reset(TemplateURLParser::Parse(fetcher_->profile(), data.data(),
                                                data.length(), NULL));
-  if (!template_url_.get() || !template_url_->url()->SupportsReplacement()) {
+  if (!template_url_.get() || !template_url_->url_ref().SupportsReplacement()) {
     fetcher_->RequestCompleted(this);
     // WARNING: RequestCompleted deletes us.
     return;
@@ -183,7 +183,7 @@
   DCHECK(model->loaded());
 
   const TemplateURL* existing_url = NULL;
-  if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()->url()),
+  if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()),
                                &existing_url)) {
     if (existing_url)
       model->Remove(existing_url);