InstantExtended: Bail on TemplateURLs with no espv.

chrome/browser/instant/instant_controller.cc

Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index c8acaa796e93ed6dda019121ff37e303f88e0ea8..9bc56a830dab7e8cb3e69b291237b9725a3d1ccf 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -1190,6 +1190,14 @@ bool InstantController::GetInstantURL(const TemplateURL* template_url,
   if (!template_url)
     return false;
 
+  // In extended mode, the TemplateURL must not have been edited by the user,
+  // since the instant_url is not editable and may no longer be correct.
+  // Also, must support the param to enable InstantExtended on the server.
+  if (extended_enabled_ &&
+      (!template_url->safe_for_autoreplace() ||

[samarth, 2013/01/16 19:08:06]

Not a big deal, but should we use the template url for regular instant either if
it's been messed with?

[sreeram, 2013/01/16 19:47:24]

Agreed. Let's do this even for regular mode.

[Jered, 2013/01/16 21:27:04]

Done.

[Jered, 2013/01/16 21:27:04]

Done.

+       template_url->search_terms_replacement_key().empty()))
+    return false;
+
   const TemplateURLRef& instant_url_ref = template_url->instant_url_ref();
   if (!instant_url_ref.IsValid())
     return false;