Re-land:

views/focus/accelerator_handler_gtk_unittest.cc

Index: views/focus/accelerator_handler_gtk_unittest.cc
===================================================================
--- views/focus/accelerator_handler_gtk_unittest.cc	(revision 85284)
+++ views/focus/accelerator_handler_gtk_unittest.cc	(working copy)
@@ -28,8 +28,7 @@
     window_ = Window::CreateChromeWindow(
         NULL, gfx::Rect(0, 0, 500, 500), this);
     window_->Show();
-    FocusManager* focus_manager = static_cast<WindowGtk*>(window_)->
-        GetFocusManager();
+    FocusManager* focus_manager = window_->GetFocusManager();
     focus_manager->RegisterAccelerator(kMenuAccelerator, this);
     focus_manager->RegisterAccelerator(kHomepageAccelerator, this);
     menu_pressed_ = false;
@@ -37,7 +36,7 @@
   }
 
   virtual void TearDown() {
-    window_->CloseWindow();
+    window_->Close();
 
     // Flush the message loop to make Purify happy.
     message_loop_.RunAllPending();