Remove win_util::FormatMessage and FormatLastWin32Error. These were only used in a couple of diagnostic places and one can always use the "Error Lookup" utility.

Move window HWND-specific functions from base/win_util.h to a new file app/win/hwnd_util.h. I plan to put some more stuff from app/win_util into this file as well.

Move gfx/window_impl.h into app/win

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6019007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70312 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 12 deletions

diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 60a4b1a..2d78895 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -10,6 +10,7 @@
 #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"
@@ -21,7 +22,6 @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_chromium_resources.h"
@@ -233,7 +233,7 @@ void TestShell::DumpAllBackForwardLists(string16* result) {
      iter != TestShell::windowList()->end(); iter++) {
     HWND hwnd = *iter;
     TestShell* shell =
-        static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+        static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
     shell->DumpBackForwardList(result);
   }
 }
@@ -249,7 +249,7 @@ bool TestShell::RunFileTest(const TestParams& params) {
 
   HWND hwnd = *(TestShell::windowList()->begin());
   TestShell* shell =
-      static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+      static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
@@ -266,7 +266,7 @@ bool TestShell::RunFileTest(const TestParams& params) {
   // ResetTestController may have closed the window we were holding on to.
   // Grab the first window again.
   hwnd = *(TestShell::windowList()->begin());
-  shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+  shell = static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
   DCHECK(shell);
 
   // Whether DevTools should be open before loading the page.
@@ -339,8 +339,8 @@ std::string TestShell::RewriteLocalUrl(const std::string& url) {
 void TestShell::PlatformCleanUp() {
   // When the window is destroyed, tell the Edit field to forget about us,
   // otherwise we will crash.
-  win_util::SetWindowProc(m_editWnd, default_edit_wnd_proc_);
-  win_util::SetWindowUserData(m_editWnd, NULL);
+  app::win::SetWindowProc(m_editWnd, default_edit_wnd_proc_);
+  app::win::SetWindowUserData(m_editWnd, NULL);
 }
 
 void TestShell::EnableUIControl(UIControl control, bool is_enabled) {
@@ -368,7 +368,7 @@ bool TestShell::Initialize(const GURL& starting_url) {
                            WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                            CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
                            NULL, NULL, instance_handle_, NULL);
-  win_util::SetWindowUserData(m_mainWnd, this);
+  app::win::SetWindowUserData(m_mainWnd, this);
 
   HWND hwnd;
   int x = 0;
@@ -404,8 +404,8 @@ bool TestShell::Initialize(const GURL& starting_url) {
                            x, 0, 0, 0, m_mainWnd, 0, instance_handle_, 0);
 
   default_edit_wnd_proc_ =
-      win_util::SetWindowProc(m_editWnd, TestShell::EditWndProc);
-  win_util::SetWindowUserData(m_editWnd, this);
+      app::win::SetWindowProc(m_editWnd, TestShell::EditWndProc);
+  app::win::SetWindowUserData(m_editWnd, this);
 
   dev_tools_agent_.reset(new TestShellDevToolsAgent());
 
@@ -441,7 +441,7 @@ void TestShell::TestFinished() {
   if (dump_when_finished_) {
     HWND hwnd = *(TestShell::windowList()->begin());
     TestShell* shell =
-        static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+        static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
     TestShell::Dump(shell);
   }
 
@@ -578,7 +578,7 @@ void TestShell::LoadURLForFrame(const GURL& url,
 
 LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
                                     LPARAM lParam) {
-  TestShell* shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+  TestShell* shell = static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
 
   switch (message) {
   case WM_COMMAND:
@@ -676,7 +676,7 @@ LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
 LRESULT CALLBACK TestShell::EditWndProc(HWND hwnd, UINT message,
                                         WPARAM wParam, LPARAM lParam) {
   TestShell* shell =
-      static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
+      static_cast<TestShell*>(app::win::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_CHAR: