Revert 112770 - Prevent a crash in the first run search engine selector.

chrome/browser/ui/views/first_run_search_engine_view.cc

Index: chrome/browser/ui/views/first_run_search_engine_view.cc
===================================================================
--- chrome/browser/ui/views/first_run_search_engine_view.cc	(revision 112803)
+++ chrome/browser/ui/views/first_run_search_engine_view.cc	(working copy)
@@ -169,13 +169,6 @@
   return l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE);
 }
 
-bool FirstRunSearchEngineView::CanClose() {
-  // We need a valid search engine to set as default, so if the user tries to
-  // close the window before the template URL service is loaded, we must prevent
-  // this from happening.
-  return fallback_choice_ != NULL;
-}
-
 void FirstRunSearchEngineView::WindowClosing() {
   // If the window is closed by clicking the close button, we default to the
   // engine in the first slot.
@@ -484,7 +477,7 @@
 
 void FirstRunSearchEngineView::ChooseSearchEngine(SearchEngineChoice* choice) {
   user_chosen_engine_ = true;
-  DCHECK(choice && template_url_service_);
+  DCHECK(template_url_service_);
   template_url_service_->SetSearchEngineDialogSlot(choice->slot());
   const TemplateURL* default_search = choice->GetSearchEngine();
   if (default_search)