| Index: webkit/support/platform_support_mac.mm
|
| diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
|
| index 099b9bfc1dab9da20b8253beee3eeafd0132c261..9b40c16da0d7a559715b0720ae3dbd9d31f0a44c 100644
|
| --- a/webkit/support/platform_support_mac.mm
|
| +++ b/webkit/support/platform_support_mac.mm
|
| @@ -19,6 +19,7 @@
|
| #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
|
| #include "ui/base/resource/data_pack.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
| +#include "webkit/support/test_webkit_platform_support.h"
|
| #import "webkit/support/drt_application_mac.h"
|
| #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
|
|
|
| @@ -156,9 +157,7 @@ void AfterShutdown() {
|
|
|
| } // namespace webkit_support
|
|
|
| -namespace webkit_glue {
|
| -
|
| -string16 GetLocalizedString(int message_id) {
|
| +string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
|
| base::StringPiece res;
|
| if (!g_resource_data_pack->GetStringPiece(message_id, &res)) {
|
| LOG(FATAL) << "failed to load webkit string with id " << message_id;
|
| @@ -194,7 +193,7 @@ static FilePath GetResourcesFilePath() {
|
| return path.AppendASCII("Resources");
|
| }
|
|
|
| -base::StringPiece GetDataResource(int resource_id) {
|
| +base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
|
| switch (resource_id) {
|
| case IDR_BROKENIMAGE: {
|
| // Use webkit's broken image icon (16x16)
|
| @@ -231,5 +230,3 @@ base::StringPiece GetDataResource(int resource_id) {
|
| g_resource_data_pack->GetStringPiece(resource_id, &res);
|
| return res;
|
| }
|
| -
|
| -} // namespace webkit_glue
|
|
|