Move UI-relevant Windows files to ui/base.

webkit/tools/test_shell/webview_host_win.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 "webkit/tools/test_shell/webview_host.h"
 
-#include "app/win/hwnd_util.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/win/hwnd_util.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 using namespace WebKit;
 
 static const wchar_t kWindowClassName[] = L"WebViewHost";
 
 /*static*/
 WebViewHost* WebViewHost::Create(HWND parent_view,
                                  TestWebViewDelegate* delegate,
@@ skipping 11 matching lines @@
     wcex.hCursor       = LoadCursor(NULL, IDC_ARROW);
     wcex.lpszClassName = kWindowClassName;
     RegisterClassEx(&wcex);
     registered_class = true;
   }
 
   host->view_ = CreateWindow(kWindowClassName, NULL,
                              WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS, 0, 0,
                              0, 0, parent_view, NULL,
                              GetModuleHandle(NULL), NULL);
-  app::win::SetWindowUserData(host->view_, host);
+  ui::SetWindowUserData(host->view_, host);
 
   host->webwidget_ = WebView::create(delegate, dev_tools_client, NULL);
   prefs.Apply(host->webview());
   host->webview()->initializeMainFrame(delegate);
 
   return host;
 }
 
 WebView* WebViewHost::webview() const {
   return static_cast<WebView*>(webwidget_);
 }