generate test_shell.pak and hook up loading net resources from

webkit/tools/test_shell/test_shell_main.cc

Index: webkit/tools/test_shell/test_shell_main.cc
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index b2f9830816e3f6c78e33f1f1878553cc1b91c1a9..f439ddb81a2fecfa8089303b6e8e894f9c41bb8a 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -32,7 +32,6 @@
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stats_table.h"
-#include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
@@ -60,19 +59,6 @@ static int kStatsFileThreads = 20;
 static int kStatsFileCounters = 200;
 
 #if defined(OS_WIN)
-StringPiece GetRawDataResource(HMODULE module, int resource_id) {
-  void* data_ptr;
-  size_t data_size;
-  return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
-                                         &data_size) ?
-      StringPiece(static_cast<char*>(data_ptr), data_size) : StringPiece();
-}
-
-// This is called indirectly by the network layer to access resources.
-StringPiece NetResourceProvider(int key) {
-  return GetRawDataResource(::GetModuleHandle(NULL), key);
-}
-
 // This test approximates whether you have the Windows XP theme selected by
 // inspecting a couple of metrics. It does not catch all cases, but it does
 // pick up on classic vs xp, and normal vs large fonts. Something it misses
@@ -224,10 +210,10 @@ int main(int argc, char* argv[]) {
   // Load ICU data tables
   icu_util::Initialize();
 
-#if defined(OS_WIN)
   // Config the network module so it has access to a limited set of resources.
-  net::NetModule::SetResourceProvider(NetResourceProvider);
+  net::NetModule::SetResourceProvider(TestShell::NetResourceProvider);
 
+#if defined(OS_WIN)
   INITCOMMONCONTROLSEX InitCtrlEx;
 
   InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);