Index: webkit/support/platform_support_win.cc |
diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc |
index f5d03aa5f793562269ed7897d5ecc8d53cf5d7e1..eff720006d1b73fb8ca9460cbf28fd1050034fe4 100644 |
--- a/webkit/support/platform_support_win.cc |
+++ b/webkit/support/platform_support_win.cc |
@@ -9,7 +9,7 @@ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/path_service.h" |
-#include "base/string16.h" |
+#include "base/string16.h.h" |
#include "base/string_piece.h" |
#include "base/win/resource_util.h" |
#include "grit/webkit_chromium_resources.h" |
@@ -69,7 +69,7 @@ void AfterShutdown() { |
} // namespace webkit_support |
-string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) { |
+base::string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) { |
wchar_t localized[MAX_LOADSTRING]; |
int length = ::LoadString(::GetModuleHandle(NULL), message_id, |
localized, MAX_LOADSTRING); |
@@ -77,7 +77,7 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) { |
NOTREACHED(); |
return L"No string for this identifier!"; |
} |
- return string16(localized, length); |
+ return base::string16(localized, length); |
} |
base::StringPiece TestWebKitPlatformSupport::GetDataResource( |