Remove win_util::FormatMessage and FormatLastWin32Error. These were only used...

webkit/tools/test_shell/test_shell_win.cc

 // 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.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #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"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"
 #include "base/stack_container.h"
 #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"
 #include "net/base/net_module.h"
 #include "net/url_request/url_request_file_job.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
@@ skipping 191 matching lines @@
   };
   return RegisterClassEx(&wcex);
 }
 
 void TestShell::DumpAllBackForwardLists(string16* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
      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);
   }
 }
 
 bool TestShell::RunFileTest(const TestParams& params) {
   SetCurrentTestName(params.test_url.c_str());
 
   // Load the test file into the first available window.
   if (TestShell::windowList()->empty()) {
     LOG(ERROR) << "No windows open.";
     return false;
   }
 
   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;
 
   // Make sure the previous load is stopped.
   shell->webView()->mainFrame()->stopLoading();
   shell->navigation_controller()->Reset();
 
   // StopLoading may update state maintained in the test controller (for
   // example, whether the WorkQueue is frozen) as such, we need to reset it
   // after we invoke StopLoading.
   shell->ResetTestController();
 
   // 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.
   bool inspector_test_mode = strstr(params.test_url.c_str(), "/inspector/") ||
                              strstr(params.test_url.c_str(), "\\inspector\\");
 
   developer_extras_enabled_ = inspector_test_mode ||
       strstr(params.test_url.c_str(), "/inspector-enabled/") ||
       strstr(params.test_url.c_str(), "\\inspector-enabled\\");
 
@@ skipping 52 matching lines @@
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 // TestShell implementation
 
 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) {
   int id;
   switch (control) {
     case BACK_BUTTON:
       id = IDC_NAV_BACK;
       break;
     case FORWARD_BUTTON:
       id = IDC_NAV_FORWARD;
       break;
     case STOP_BUTTON:
       id = IDC_NAV_STOP;
       break;
     default:
       NOTREACHED() << "Unknown UI control";
       return;
   }
   EnableWindow(GetDlgItem(m_mainWnd, id), is_enabled);
 }
 
 bool TestShell::Initialize(const GURL& starting_url) {
   // Perform application initialization:
   m_mainWnd = CreateWindow(g_windowClass, g_windowTitle,
                            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;
 
   hwnd = CreateWindow(L"BUTTON", L"Back",
                       WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON ,
                       x, 0, BUTTON_WIDTH, URLBAR_HEIGHT,
                       m_mainWnd, (HMENU) IDC_NAV_BACK, instance_handle_, 0);
   x += BUTTON_WIDTH;
 
@@ skipping 15 matching lines @@
                       m_mainWnd, (HMENU) IDC_NAV_STOP, instance_handle_, 0);
   x += BUTTON_WIDTH;
 
   // this control is positioned by ResizeSubViews
   m_editWnd = CreateWindow(L"EDIT", 0,
                            WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT |
                            ES_AUTOVSCROLL | ES_AUTOHSCROLL,
                            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());
 
   // create webview
   m_webViewHost.reset(
       WebViewHost::Create(m_mainWnd,
                           delegate_.get(),
                           dev_tools_agent_.get(),
                           *TestShell::web_prefs_));
   dev_tools_agent_->SetWebView(m_webViewHost->webview());
@@ skipping 15 matching lines @@
 }
 
 void TestShell::TestFinished() {
   if (!test_is_pending_)
     return;  // reached when running under test_shell_tests
 
   test_is_pending_ = false;
   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);
   }
 
   UINT_PTR timer_id = reinterpret_cast<UINT_PTR>(this);
   KillTimer(mainWnd(), timer_id);
 
   MessageLoop::current()->Quit();
 }
 
 // Thread main to run for the thread which just tests for timeout.
@@ skipping 116 matching lines @@
     if (layout_test_mode())
       SizeToDefault();
   }
 
   navigation_controller_->LoadEntry(
       new TestNavigationEntry(-1, url, std::wstring(), frame_name));
 }
 
 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:
     {
       int wmId    = LOWORD(wParam);
       int wmEvent = HIWORD(wParam);
 
       switch (wmId) {
       case IDM_ABOUT:
         DialogBox(shell->instance_handle_, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd,
@@ skipping 77 matching lines @@
 
   return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
 
 #define MAX_URL_LENGTH  1024
 
 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:
       if (wParam == VK_RETURN) {
         wchar_t str[MAX_URL_LENGTH + 1];  // Leave room for adding a NULL;
         *((LPWORD)str) = MAX_URL_LENGTH;
         LRESULT str_len = SendMessage(hwnd, EM_GETLINE, 0, (LPARAM)str);
         if (str_len > 0) {
           str[str_len] = 0;  // EM_GETLINE doesn't NULL terminate.
           shell->LoadURL(GURL(str));
@@ skipping 132 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue