Move UI-relevant Windows files to ui/base.

webkit/tools/test_shell/webwidget_host_win.cc

Index: webkit/tools/test_shell/webwidget_host_win.cc
===================================================================
--- webkit/tools/test_shell/webwidget_host_win.cc	(revision 71828)
+++ webkit/tools/test_shell/webwidget_host_win.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "app/win/hwnd_util.h"
 #include "base/logging.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
@@ -14,6 +13,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h"
+#include "ui/base/win/hwnd_util.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebInputEvent;
@@ -52,7 +52,7 @@
                                kWindowClassName, kWindowClassName, WS_POPUP,
                                0, 0, 0, 0,
                                parent_view, NULL, GetModuleHandle(NULL), NULL);
-  app::win::SetWindowUserData(host->view_, host);
+  ui::SetWindowUserData(host->view_, host);
 
   host->webwidget_ = WebPopupMenu::create(client);
 
@@ -60,7 +60,7 @@
 }
 
 static WebWidgetHost* FromWindow(HWND view) {
-  return reinterpret_cast<WebWidgetHost*>(app::win::GetWindowUserData(view));
+  return reinterpret_cast<WebWidgetHost*>(ui::GetWindowUserData(view));
 }
 
 /*static*/
@@ -205,7 +205,7 @@
 }
 
 WebWidgetHost::~WebWidgetHost() {
-  app::win::SetWindowUserData(view_, 0);
+  ui::SetWindowUserData(view_, 0);
 
   TrackMouseLeave(false);