| Index: webkit/tools/test_shell/mock_webclipboard_impl.h
|
| diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/tools/test_shell/mock_webclipboard_impl.h
|
| index b4c35775b9bcc8a3cf32c0d9186e5edd7f2996f2..4edc209cdc46b502d2e63e4d3b795cea31ecb783 100644
|
| --- a/webkit/tools/test_shell/mock_webclipboard_impl.h
|
| +++ b/webkit/tools/test_shell/mock_webclipboard_impl.h
|
| @@ -12,7 +12,7 @@
|
|
|
| #include <map>
|
|
|
| -#include "base/string16.h"
|
| +#include "base/string16.h.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebClipboard.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
|
| @@ -53,7 +53,7 @@ class MockWebClipboardImpl : public WebKit::WebClipboard {
|
| WebKit::WebString m_plainText;
|
| WebKit::WebString m_htmlText;
|
| WebKit::WebImage m_image;
|
| - std::map<string16, string16> m_customData;
|
| + std::map<base::string16, base::string16> m_customData;
|
| bool m_writeSmartPaste;
|
| };
|
|
|
|
|