Use LoadString instead of the ATL-dependent AtlGetStringResourceImage....

webkit/tools/test_shell/test_shell_win.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 <atlbase.h>
 #include <commdlg.h>
 #include <objbase.h>
+#include <process.h>
 #include <shlwapi.h>
 #include <wininet.h>  // For INTERNET_MAX_URL_LENGTH
 
 #include "base/command_line.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"
@@ skipping 16 matching lines @@
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
 using WebKit::WebWidget;
 
 #define MAX_LOADSTRING 100
 
 #define BUTTON_WIDTH 72
 #define URLBAR_HEIGHT  24
 
 // Global Variables:
-static TCHAR g_windowTitle[MAX_LOADSTRING];     // The title bar text
-static TCHAR g_windowClass[MAX_LOADSTRING];     // The main window class name
+static wchar_t g_windowTitle[MAX_LOADSTRING];     // The title bar text
+static wchar_t g_windowClass[MAX_LOADSTRING];     // The main window class name
 
 // This is only set for layout tests.  It is used to determine the name of a
 // minidump file.
 static const size_t kPathBufSize = 2048;
 static wchar_t g_currentTestName[kPathBufSize];
 
 // Forward declarations of functions included in this code module:
 static INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM);
 
 // Hide the window offscreen when in layout test mode.
@@ skipping 453 matching lines @@
   if (bIsSVGTest) {
     SizeToSVG();
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
   std::wstring urlString(url);
   if (!urlString.empty() && (PathFileExists(url) || PathIsUNC(url))) {
-      TCHAR fileURL[INTERNET_MAX_URL_LENGTH];
+      wchar_t fileURL[INTERNET_MAX_URL_LENGTH];
       DWORD fileURLLength = sizeof(fileURL)/sizeof(fileURL[0]);

[Peter Kasting, 2009/08/03 18:41:37]

Nit: I'd just change this to INTERNET_MAX_URL_LENGTH, it seems more readable and
less error-prone.

       if (SUCCEEDED(UrlCreateFromPath(url, fileURL, &fileURLLength, 0)))
           urlString.assign(fileURL);
   }
 
   std::wstring frame_string;
   if (frame_name)
       frame_string = frame_name;
 
   navigation_controller_->LoadEntry(new TestNavigationEntry(
       -1, GURL(urlString), std::wstring(), frame_string));
@@ skipping 145 matching lines @@
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // WebKit glue functions
 
 namespace webkit_glue {
 
 string16 GetLocalizedString(int message_id) {
-  const ATLSTRINGRESOURCEIMAGE* image =
-      AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(),
-                                message_id);
-  if (!image) {
+  wchar_t localized[MAX_LOADSTRING];
+  int length = LoadString(GetModuleHandle(NULL), message_id,
+                          localized, MAX_LOADSTRING);
+  if (!length && GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND) {
     NOTREACHED();
     return L"No string for this identifier!";
   }
-  return string16(image->achString, image->nLength);
+  return string16(localized, length);
 }
 
 // TODO(tc): Convert this to using resources from test_shell.rc.
 StringPiece GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
@@ skipping 55 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue