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

chrome/browser/instant/instant_controller.cc

Index: chrome/browser/instant/instant_controller.cc
===================================================================
--- chrome/browser/instant/instant_controller.cc	(revision 129864)
+++ chrome/browser/instant/instant_controller.cc	(working copy)
@@ -529,8 +529,8 @@
 // Returns true if |template_url| is a valid TemplateURL for use by instant.
 bool InstantController::IsValidInstantTemplateURL(
     const TemplateURL* template_url) {
-  return template_url && template_url->instant_url() && template_url->id() &&

[sky, 2012/03/30 22:00:29]

I think we should keep this id() check. During startup the id() may not be set,
which I think can cause problems later on.

-      template_url->instant_url()->SupportsReplacement() &&
+  return template_url &&
+      template_url->instant_url_ref().SupportsReplacement() &&
       !IsBlacklistedFromInstant(template_url->id());
 }