Move base/resource_util.* into base/win/ since it's windows specific.

Review URL: http://codereview.chromium.org/7698005

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

3 files changed, 8 insertions, 9 deletions

diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
index 687ef0e..fb5126e 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -9,9 +9,9 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/resource_util.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
+#include "base/win/resource_util.h"
 #include "grit/webkit_chromium_resources.h"
 #include "grit/webkit_resources.h"
 
@@ -29,8 +29,8 @@ FilePath GetResourceFilePath(const char* ascii_name) {
 base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
-  return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
-                                         &data_size)
+  return base::win::GetDataResourceFromModule(module, resource_id, &data_ptr,
+                                              &data_size)
       ? base::StringPiece(static_cast<char*>(data_ptr), data_size)
       : base::StringPiece();
 }
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
index 7a2088f..cb9c3da 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
@@ -9,7 +9,6 @@
 
 #include "base/command_line.h"
 #include "base/event_recorder.h"
-#include "base/resource_util.h"
 #include "base/win/win_util.h"
 #include "ui/gfx/native_theme_win.h"
 #include "webkit/tools/test_shell/foreground_helper.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index fbdd03c..fa72f4f 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -15,11 +15,11 @@
 #include "base/file_util.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/resource_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_chromium_resources.h"
@@ -131,8 +131,8 @@ FilePath GetResourcesFilePath() {
 static base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
-  return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
-                                         &data_size)
+  return base::win::GetDataResourceFromModule(module, resource_id, &data_ptr,
+                                              &data_size)
       ? base::StringPiece(static_cast<char*>(data_ptr), data_size)
       : base::StringPiece();
 }
@@ -169,8 +169,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
   DWORD num_fonts = 1;
   void* font_ptr;
   size_t font_size;
-  if (base::GetDataResourceFromModule(::GetModuleHandle(NULL), IDR_AHEM_FONT,
-                                      &font_ptr, &font_size)) {
+  if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL),
+      IDR_AHEM_FONT, &font_ptr, &font_size)) {
     HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts);
     DCHECK(rc != 0);
   }