Re-land:

chrome/browser/ui/views/first_run_search_engine_view.cc

 // Copyright (c) 2011 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/ui/views/first_run_search_engine_view.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 56 matching lines @@
       NULL,
       gfx::Rect(),
       new FirstRunSearchEngineView(
           profile, randomize_search_engine_experiment));
   DCHECK(window);
 
   window->SetIsAlwaysOnTop(true);
   window->Show();
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
-  window->CloseWindow();
+  window->Close();
 }
 
 }  // namespace first_run
 
 SearchEngineChoice::SearchEngineChoice(views::ButtonListener* listener,
                                        const TemplateURL* search_engine,
                                        bool use_small_logos)
     : NativeButton(
           listener,
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_SEARCH_CHOOSE))),
@@ skipping 370 matching lines @@
 }
 
 void FirstRunSearchEngineView::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }
 
 std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
   return UTF16ToWide(l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE));
 }