InstantExtended: Bail on TemplateURLs with no espv.

chrome/browser/instant/instant_controller.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1172 matching lines @@
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kInstantURL)) {
     *instant_url = command_line->GetSwitchValueASCII(switches::kInstantURL);
     return template_url != NULL;
   }
 
   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;
 
   // Even if the URL template doesn't have search terms, it may have other
   // components (such as {google:baseURL}) that need to be replaced.
   *instant_url = instant_url_ref.ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(string16()));
 
   // Extended mode should always use HTTPS. TODO(sreeram): This section can be
@@ skipping 22 matching lines @@
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_BLOCKED_BY_BLACKLIST);
     return false;
   }
 
   return true;
 }