Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

webkit/tools/test_shell/test_shell_win.cc

Index: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index fa72f4f8c703c6c613ade78cddd770f8f6f2a86b..7a15880ac85597a4e0f2600cafad8534b2a1e308 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -36,6 +36,7 @@
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
+#include "webkit/tools/test_shell/test_shell_webkit_init.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 using WebKit::WebWidget;
@@ -657,12 +658,7 @@ base::StringPiece TestShell::ResourceProvider(int key) {
 }
 
 
-/////////////////////////////////////////////////////////////////////////////
-// WebKit glue functions
-
-namespace webkit_glue {
-
-string16 GetLocalizedString(int message_id) {
+string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   wchar_t localized[MAX_LOADSTRING];
   int length = LoadString(GetModuleHandle(NULL), message_id,
                           localized, MAX_LOADSTRING);
@@ -674,7 +670,7 @@ string16 GetLocalizedString(int message_id) {
 }
 
 // TODO(tc): Convert this to using resources from test_shell.rc.
-base::StringPiece GetDataResource(int resource_id) {
+base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
@@ -727,6 +723,11 @@ base::StringPiece GetDataResource(int resource_id) {
   return base::StringPiece();
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// WebKit glue functions
+
+namespace webkit_glue {
+
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }