Do not use a UIThreadSearchTermsData when validating a TemplateURL for which the Profile is NULL.

chrome/browser/search_engines/template_url_parser.cc

 // Copyright (c) 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/search_engines/template_url_parser.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "libxml/parser.h"
 #include "libxml/xmlwriter.h"
 #include "ui/gfx/favicon_size.h"
 
 namespace {
 
@@ skipping 276 matching lines @@
   // (see the TODO in EndElementImpl()).
   GURL search_url(data_.url());
   if (derive_image_from_url_ && data_.favicon_url.is_empty())
     data_.favicon_url = TemplateURL::GenerateFaviconURL(search_url);
 
   data_.SetKeyword(TemplateURLService::GenerateKeyword(search_url));
   data_.show_in_default_list = show_in_default_list;
 
   // Bail if the search URL is empty or if either TemplateURLRef is invalid.
   scoped_ptr<TemplateURL> template_url(new TemplateURL(profile, data_));
-  if (template_url->url().empty() || !template_url->url_ref().IsValid() ||
+  // Do not use a UIThreadSearchTermsData if a profile wasn't provided as it
+  // results in the same thing (relevant UIThreadSearchTermsData methods default
+  // to SearchTermsData methods when the profile is NULL), but prevents
+  // validity checks on non-UI threads.

[Peter Kasting, 2013/04/17 22:50:06]

This comment is extremely confusing.  I would remove it entirely.

[gab, 2013/04/18 15:00:27]

Done.

+  scoped_ptr<SearchTermsData> search_terms_data(profile ?
+      new UIThreadSearchTermsData(profile) : new SearchTermsData());
+  if (template_url->url().empty() ||
+      !template_url->url_ref().IsValidUsingTermsData(*search_terms_data) ||
       (!template_url->suggestions_url().empty() &&
-       !template_url->suggestions_url_ref().IsValid()))
+       !template_url->suggestions_url_ref().
+           IsValidUsingTermsData(*search_terms_data))) {
     return NULL;
+  }
 
   return template_url.release();
 }
 
 // static
 void TemplateURLParsingContext::InitMapping() {
   kElementNameToElementTypeMap = new std::map<std::string, ElementType>;
   (*kElementNameToElementTypeMap)[kURLElement] = URL;
   (*kElementNameToElementTypeMap)[kParamElement] = PARAM;
   (*kElementNameToElementTypeMap)[kShortNameElement] = SHORT_NAME;
@@ skipping 161 matching lines @@
   memset(&sax_handler, 0, sizeof(sax_handler));
   sax_handler.startElement = &TemplateURLParsingContext::StartElementImpl;
   sax_handler.endElement = &TemplateURLParsingContext::EndElementImpl;
   sax_handler.characters = &TemplateURLParsingContext::CharactersImpl;
   int error = xmlSAXUserParseMemory(&sax_handler, &context, data,
                                     static_cast<int>(length));
   xmlSubstituteEntitiesDefault(last_sub_entities_value);
 
   return error ? NULL : context.GetTemplateURL(profile, show_in_default_list);
 }