Re-land:

views/focus/accelerator_handler_gtk_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 <gdk/gdkkeysyms.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/view.h"
@@ skipping 10 matching lines @@
   AcceleratorHandlerGtkTest()
       : kMenuAccelerator(ui::VKEY_MENU, false, false, false),
         kHomepageAccelerator(ui::VKEY_HOME, false, false, true),
         content_view_(NULL) {
   }
 
   virtual void SetUp() {
     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;
     home_pressed_ = false;
   }
 
   virtual void TearDown() {
-    window_->CloseWindow();
+    window_->Close();
 
     // Flush the message loop to make Purify happy.
     message_loop_.RunAllPending();
   }
 
   GdkEventKey CreateKeyEvent(GdkEventType type, guint keyval, guint state) {
     GdkEventKey evt;
     memset(&evt, 0, sizeof(evt));
     evt.type = type;
     evt.keyval = keyval;
@@ skipping 133 matching lines @@
 
   // Release Alt - now this should trigger the menu shortcut.
   evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   evt.hardware_keycode = 0x40;
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_TRUE(menu_pressed_);
 }
 
 }  // namespace views