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

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

This was otherwise firing a DCHECK (see https://code.google.com/p/chromium/issues/detail?id=231710#c3) that blocked new (yet to be committed) tests for issue 219419).

BUG=231710, 219419
TEST=Fixes yet to be committed tests for issue 219419.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=194949

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

https://codereview.chromium.org/14232019/diff/1/chrome/browser/search_engines...
File chrome/browser/search_engines/template_url.cc (right):

https://codereview.chromium.org/14232019/diff/1/chrome/browser/search_engines...
chrome/browser/search_engines/template_url.cc:372: // results in the same thing
(relevant UIThreadSearchTermsData methods default
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]

https://codereview.chromium.org/14232019/diff/1/chrome/browser/search_engines...
File chrome/browser/search_engines/template_url.cc (right):

https://codereview.chromium.org/14232019/diff/1/chrome/browser/search_engines...
chrome/browser/search_engines/template_url.cc:372: // results in the same thing
(relevant UIThreadSearchTermsData methods default
On 2013/04/17 22:11:56, Peter Kasting wrote:
> 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.

Sounds good, hesitated between the two, PTAL.

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

LGTM with comment changes

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
File chrome/browser/search_engines/template_url_parser.cc (right):

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
chrome/browser/search_engines/template_url_parser.cc:316: // validity checks on
non-UI threads.
This comment is extremely confusing.  I would remove it entirely.

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
File chrome/browser/search_engines/template_url_parser.h (right):

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
chrome/browser/search_engines/template_url_parser.h:32: // |profile| will be
used to generate the TemplateUrl returned and should
Nit: The profile isn't used to generate the TURL, so this comment is incorrect. 
Just say:

|profile| should only be non-NULL if this function is called on the UI thread.

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

Thanks, done!

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
File chrome/browser/search_engines/template_url_parser.cc (right):

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
chrome/browser/search_engines/template_url_parser.cc:316: // validity checks on
non-UI threads.
On 2013/04/17 22:50:06, Peter Kasting wrote:
> This comment is extremely confusing.  I would remove it entirely.

Done.

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
File chrome/browser/search_engines/template_url_parser.h (right):

https://codereview.chromium.org/14232019/diff/3002/chrome/browser/search_engi...
chrome/browser/search_engines/template_url_parser.h:32: // |profile| will be
used to generate the TemplateUrl returned and should
On 2013/04/17 22:50:06, Peter Kasting wrote:
> Nit: The profile isn't used to generate the TURL, so this comment is
incorrect. 
> Just say:
> 
> |profile| should only be non-NULL if this function is called on the UI thread.

Done.

[commit-bot: I haz the power, 2013-04-18 15:00:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/14232019/10001

[commit-bot: I haz the power, 2013-04-18 16:54:06]

Change committed as 194949