Re-land:

views/controls/tabbed_pane/tabbed_pane_unittest.cc

 // Copyright (c) 2010 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 "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/window/window.h"
 #include "views/window/window_delegate.h"
 
@@ skipping 26 matching lines @@
   }
 
  private:
   virtual void SetUp() {
     tabbed_pane_ = new TabbedPane();
     window_ = Window::CreateChromeWindow(NULL, gfx::Rect(0, 0, 100, 100), this);
     window_->Show();
   }
 
   virtual void TearDown() {
-    window_->CloseWindow();
+    window_->Close();
     message_loop_.RunAllPending();
   }
 
   virtual views::View* GetContentsView() {
     return tabbed_pane_;
   }
 
   MessageLoopForUI message_loop_;
   Window* window_;
 
@@ skipping 21 matching lines @@
   EXPECT_LT(bounds.width(), 100);
   EXPECT_GT(bounds.height(), 0);
   EXPECT_LT(bounds.height(), 200);
 
   // If we switch to the other tab, it should get assigned the same bounds.
   tabbed_pane_->SelectTabAt(1);
   EXPECT_EQ(bounds, child2->bounds());
 }
 
 } // namespace views