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

chrome/browser/search_engines/template_url.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.h"
 
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 350 matching lines @@
       default:
         NOTREACHED();
         break;
     }
   }
 
   return url;
 }
 
 bool TemplateURLRef::IsValid() const {
-  UIThreadSearchTermsData search_terms_data(owner_->profile());
-  return IsValidUsingTermsData(search_terms_data);
+  // Do not use a UIThreadSearchTermsData if a profile wasn't provided as it
+  // results in the same thing (relevant UIThreadSearchTermsData methods default

[Peter Kasting, 2013/04/17 22:11:56]

This is the wrong layer to be doing this.  All TemplateURLRef functions that
have a UsingTermsData() alternative should be left as-is.  It's the caller who
needs to choose the right one.

[gab, 2013/04/17 22:46:50]

Sounds good, hesitated between the two, PTAL.

+  // to SearchTermsData methods when the profile is NULL), but prevents
+  // validity checks on non-UI threads.
+  scoped_ptr<SearchTermsData> search_terms_data(owner_->profile() ?
+      new UIThreadSearchTermsData(owner_->profile()) : new SearchTermsData());
+  return IsValidUsingTermsData(*search_terms_data);
 }
 
 bool TemplateURLRef::IsValidUsingTermsData(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessaryUsingTermsData(search_terms_data);
   return valid_;
 }
 
 string16 TemplateURLRef::DisplayURL() const {
   ParseIfNecessary();
@@ skipping 613 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }