Revert "Reverting 23406" as it didn't break any tests....

webkit/tools/test_shell/foreground_helper.h

 // Copyright (c) 2009 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_FOREGROUND_HELPER_H_
 #define WEBKIT_TOOLS_TEST_SHELL_FOREGROUND_HELPER_H_
 
 #include "base/logging.h"
 #include "base/window_impl.h"
 
@@ skipping 20 matching lines @@
     return S_OK;
   }
 
  private:
   HRESULT ForegroundHotKey(HWND window) {
     // This implementation registers a hot key (F22) and then
     // triggers the hot key.  When receiving the hot key, we'll
     // be in the foreground and allowed to move the target window
     // into the foreground too.
 
-    set_window_ex_style(WS_POPUP);
+    set_window_style(WS_POPUP);
     Init(NULL, gfx::Rect());
 
     static const int hotkey_id = 0x0000baba;
 
     // Store the target window into our USERDATA for use in our
     // HotKey handler.
-    SetWindowLongPtr(GetNativeView(), GWLP_USERDATA,
+    SetWindowLongPtr(hwnd(), GWLP_USERDATA,
                      reinterpret_cast<ULONG_PTR>(window));
-    RegisterHotKey(GetNativeView(), hotkey_id, 0, VK_F22);
+    RegisterHotKey(hwnd(), hotkey_id, 0, VK_F22);
 
     // If the calling thread is not yet a UI thread, call PeekMessage
     // to ensure creation of its message queue.
     MSG msg = {0};
     PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
 
     // Send the Hotkey.
     INPUT hotkey = {0};
     hotkey.type = INPUT_KEYBOARD;
     hotkey.ki.wVk =  VK_F22;
     if (1 != SendInput(1, &hotkey, sizeof(hotkey)))
       return E_FAIL;
 
     // Loop until we get the key.
     // TODO: It may be possible to get stuck here if the
     // message gets lost?
     while (GetMessage(&msg, NULL, 0, 0)) {
       TranslateMessage(&msg);
       DispatchMessage(&msg);
 
       if (WM_HOTKEY == msg.message)
         break;
     }
 
-    UnregisterHotKey(GetNativeView(), hotkey_id);
-    DestroyWindow();
+    UnregisterHotKey(hwnd(), hotkey_id);
+    DestroyWindow(hwnd());
 
     return S_OK;
   }
 
   // Handle the registered Hotkey being pressed.
   LRESULT OnHotKey(UINT message,
                    WPARAM wparam,
                    LPARAM lparam,
                    BOOL& handled) {
-    HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(GetNativeView(),
+    HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(hwnd(),
                                                           GWLP_USERDATA));
     SetForegroundWindow(window);
     return 1;
   }
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_FOREGROUND_HELPER_H_