| Index: webkit/tools/test_shell/test_shell_gtk.cc
|
| diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
|
| index c2b37b1e05683486fcf04d4ac8abe09a2cb450cd..ee921a87e054de0e7de9bd77a2dfd07dba0297aa 100644
|
| --- a/webkit/tools/test_shell/test_shell_gtk.cc
|
| +++ b/webkit/tools/test_shell/test_shell_gtk.cc
|
| @@ -32,6 +32,7 @@
|
| #include "webkit/glue/webpreferences.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
| #include "webkit/tools/test_shell/test_navigation_controller.h"
|
| +#include "webkit/tools/test_shell/test_shell_webkit_init.h"
|
| #include "webkit/tools/test_shell/test_webview_delegate.h"
|
|
|
| using WebKit::WebPoint;
|
| @@ -562,13 +563,11 @@ base::StringPiece TestShell::ResourceProvider(int key) {
|
|
|
| //-----------------------------------------------------------------------------
|
|
|
| -namespace webkit_glue {
|
| -
|
| -string16 GetLocalizedString(int message_id) {
|
| +string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
|
| return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
|
| }
|
|
|
| -base::StringPiece GetDataResource(int resource_id) {
|
| +base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
|
| switch (resource_id) {
|
| case IDR_BROKENIMAGE:
|
| resource_id = IDR_BROKENIMAGE_TESTSHELL;
|
| @@ -579,5 +578,3 @@ base::StringPiece GetDataResource(int resource_id) {
|
| }
|
| return TestShell::ResourceProvider(resource_id);
|
| }
|
| -
|
| -} // namespace webkit_glue
|
|
|