Re-land:

chrome/test/interactive_ui/view_event_test_base.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 "chrome/test/interactive_ui/view_event_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
@@ skipping 70 matching lines @@
   OleInitialize(NULL);
 #endif
   window_ = views::Window::CreateChromeWindow(NULL, gfx::Rect(), this);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN)
     DestroyWindow(window_->GetNativeWindow());
 #else
-    window_->CloseWindow();
+    window_->Close();
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
     ui_test_utils::RunMessageLoop();
 #endif
     window_ = NULL;
   }
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
@@ skipping 70 matching lines @@
 
 void ViewEventTestBase::TimedOut() {
   std::string error_message = "Test timed out. Each test runs for a max of ";
   error_message += base::IntToString(kTimeoutInMS);
   error_message += " ms (kTimeoutInMS).";
 
   GTEST_NONFATAL_FAILURE_(error_message.c_str());
 
   Done();
 }