Revert "Support the IDR_SEARCH_xxx images in test_shell. Untested outside of Windows. Not going to work on mac since NetResourceProvider() is NOTIMPLEMENTED()."

This reverts commit r12670.

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

3 files changed, 3 insertions, 18 deletions

diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 3aecac0..cc5f5d2 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -666,15 +666,12 @@ std::string GetDataResource(int resource_id) {
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
-    case IDR_SEARCH_CANCEL:
-    case IDR_SEARCH_CANCEL_PRESSED:
-    case IDR_SEARCH_MAGNIFIER:
-    case IDR_SEARCH_MAGNIFIER_RESULTS:
-      break;
     default:
       NOTREACHED();
   }
-  return NetResourceProvider(resource_id).as_string();
+  StringPiece res;
+  g_resource_data_pack->Get(resource_id, &res);
+  return res.as_string();
 }
 
 bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index abf82fd..5df878e 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -689,12 +689,6 @@ std::string GetDataResource(int resource_id) {
     return resize_corner_data;
   }
 
-  case IDR_SEARCH_CANCEL:
-  case IDR_SEARCH_CANCEL_PRESSED:
-  case IDR_SEARCH_MAGNIFIER:
-  case IDR_SEARCH_MAGNIFIER_RESULTS:
-    return NetResourceProvider(resource_id).as_string();
-
   default:
     break;
   }
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index fdd2fe9..c1d3ff1 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -734,12 +734,6 @@ std::string GetDataResource(int resource_id) {
     return resize_corner_data;
   }
 
-  case IDR_SEARCH_CANCEL:
-  case IDR_SEARCH_CANCEL_PRESSED:
-  case IDR_SEARCH_MAGNIFIER:
-  case IDR_SEARCH_MAGNIFIER_RESULTS:
-    return NetResourceProvider(resource_id).as_string();
-
   default:
     break;
   }