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

chrome/browser/instant/instant_loader.cc

Index: chrome/browser/instant/instant_loader.cc
===================================================================
--- chrome/browser/instant/instant_loader.cc	(revision 129864)
+++ chrome/browser/instant/instant_loader.cc	(working copy)
@@ -1127,8 +1127,9 @@
   // functionality so that embeded tags (like {google:baseURL}) are escaped
   // correctly.
   // TODO(sky): having to use a replaceable url is a bit of a hack here.
-  GURL instant_url(template_url->instant_url()->ReplaceSearchTermsUsingProfile(
-      tab_contents->profile(), string16(), -1, string16()));
+  GURL instant_url(
+      template_url->instant_url_ref().ReplaceSearchTermsUsingProfile(
+          tab_contents->profile(), string16(), -1, string16()));
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kInstantURL))
     instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL));