Re-land:

views/controls/table/table_view_unittest.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 178 matching lines @@
   columns[0].id = 0;
   columns[1].id = 1;
   table_ = new TableView(model_.get(), columns, views::ICON_AND_TEXT,
                          false, false, false);
   window_ =
       views::Window::CreateChromeWindow(NULL, gfx::Rect(100, 100, 512, 512),
                                         this);
 }
 
 void TableViewTest::TearDown() {
-  window_->CloseWindow();
+  window_->Close();
   // Temporary workaround to avoid leak of RootView::pending_paint_task_.
   message_loop_.RunAllPending();
   OleUninitialize();
 }
 
 void TableViewTest::VerifyViewOrder(int first, ...) {
   va_list marker;
   va_start(marker, first);
   int value = first;
   int index = 0;
@@ skipping 301 matching lines @@
   columns[1].id = 1;
   table_ = new views::TableView2(model_.get(), columns, GetTableType(),
                                  views::TableView2::NONE);
   window_ = views::Window::CreateChromeWindow(NULL,
                                               gfx::Rect(100, 100, 512, 512),
                                               this);
   window_->Show();
 }
 
 void TableView2Test::TearDown() {
-  window_->CloseWindow();
+  window_->Close();
   // Temporary workaround to avoid leak of RootView::pending_paint_task_.
   message_loop_.RunAllPending();
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 TestTableModel* TableView2Test::CreateModel() {
   return new TestTableModel();
 }
@@ skipping 99 matching lines @@
 
   table_->FocusRow(2);
   EXPECT_EQ(2, table_->GetFirstFocusedRow());
 
   table_->ClearRowFocus();
   EXPECT_EQ(-1, table_->GetFirstSelectedRow());
 }
 #endif
 
 }  // namespace views