Merge 113149 - Reland 112770, but with test disabled.

Merge 113149 - Reland 112770, but with test disabled.

Prevent a crash in the first run search engine selector.

It is possible to try and close the window now before the TemplateURLService is loaded. In this case we will not have a fallback search engine to select by default. So we will just reject attempts to close the window in this circumstance until it is loaded and a fallback choice has been set. It should be an edge case.

BUG=106078
TEST=unit test

Review URL: http://codereview.chromium.org/8771018

TBR=ben@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113514

[Ben Goodger (Google), 2011-12-08 03:05:18]

LGTM

On Wed, Dec 7, 2011 at 4:26 PM, <kerz@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Merge 113149 - Reland 112770, but with test disabled.
>
> Prevent a crash in the first run search engine selector.
>
> It is possible to try and close the window now before the
> TemplateURLService is
> loaded. In this case we will not have a fallback search engine to select by
> default. So we will just reject attempts to close the window in this
> circumstance until it is loaded and a fallback choice has been set. It
> should be
> an edge case.
>
> BUG=106078
> TEST=unit test
>
> Review URL:
http://codereview.chromium.**org/8771018<http://codereview.chromium.org/8771018>
>
> TBR=ben@chromium.org
>
> Please review this at
http://codereview.chromium.**org/8870007/<http://codereview.chromium.org/8870...
>
> SVN Base:
svn://svn.chromium.org/chrome/**branches/963/src/<http://svn.chromium.org/chrome/branches/963/src/>
>
> Affected files:
>  M     chrome/browser/ui/views/first_**run_search_engine_view.h
>  M     chrome/browser/ui/views/first_**run_search_engine_view.cc
>  M     chrome/browser/ui/views/first_**run_search_engine_view_**
> unittest.cc
>  M     ui/views/test/views_test_base.**h
>
>
>