Move UI-relevant Windows files to ui/base.

webkit/tools/test_shell/test_shell_win.cc

Index: webkit/tools/test_shell/test_shell_win.cc
===================================================================
--- webkit/tools/test_shell/test_shell_win.cc	(revision 71828)
+++ webkit/tools/test_shell/test_shell_win.cc	(working copy)
@@ -10,7 +10,6 @@
 #include <process.h>
 #include <shlwapi.h>
 
-#include "app/win/hwnd_util.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ -30,6 +29,7 @@
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/win/hwnd_util.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/plugins/plugin_list.h"
@@ -233,7 +233,7 @@
      iter != TestShell::windowList()->end(); iter++) {
     HWND hwnd = *iter;
     TestShell* shell =
-        static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+        static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
     shell->DumpBackForwardList(result);
   }
 }
@@ -249,7 +249,7 @@
 
   HWND hwnd = *(TestShell::windowList()->begin());
   TestShell* shell =
-      static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+      static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
@@ -266,7 +266,7 @@
   // ResetTestController may have closed the window we were holding on to.
   // Grab the first window again.
   hwnd = *(TestShell::windowList()->begin());
-  shell = static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+  shell = static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
   DCHECK(shell);
 
   // Whether DevTools should be open before loading the page.
@@ -339,8 +339,8 @@
 void TestShell::PlatformCleanUp() {
   // When the window is destroyed, tell the Edit field to forget about us,
   // otherwise we will crash.
-  app::win::SetWindowProc(m_editWnd, default_edit_wnd_proc_);
-  app::win::SetWindowUserData(m_editWnd, NULL);
+  ui::SetWindowProc(m_editWnd, default_edit_wnd_proc_);
+  ui::SetWindowUserData(m_editWnd, NULL);
 }
 
 void TestShell::EnableUIControl(UIControl control, bool is_enabled) {
@@ -368,7 +368,7 @@
                            WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                            CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
                            NULL, NULL, instance_handle_, NULL);
-  app::win::SetWindowUserData(m_mainWnd, this);
+  ui::SetWindowUserData(m_mainWnd, this);
 
   HWND hwnd;
   int x = 0;
@@ -403,9 +403,8 @@
                            ES_AUTOVSCROLL | ES_AUTOHSCROLL,
                            x, 0, 0, 0, m_mainWnd, 0, instance_handle_, 0);
 
-  default_edit_wnd_proc_ =
-      app::win::SetWindowProc(m_editWnd, TestShell::EditWndProc);
-  app::win::SetWindowUserData(m_editWnd, this);
+  default_edit_wnd_proc_ = ui::SetWindowProc(m_editWnd, TestShell::EditWndProc);
+  ui::SetWindowUserData(m_editWnd, this);
 
   dev_tools_agent_.reset(new TestShellDevToolsAgent());
 
@@ -441,7 +440,7 @@
   if (dump_when_finished_) {
     HWND hwnd = *(TestShell::windowList()->begin());
     TestShell* shell =
-        static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+        static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
     TestShell::Dump(shell);
   }
 
@@ -578,7 +577,7 @@
 
 LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
                                     LPARAM lParam) {
-  TestShell* shell = static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+  TestShell* shell = static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
 
   switch (message) {
   case WM_COMMAND:
@@ -676,7 +675,7 @@
 LRESULT CALLBACK TestShell::EditWndProc(HWND hwnd, UINT message,
                                         WPARAM wParam, LPARAM lParam) {
   TestShell* shell =
-      static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
+      static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_CHAR: