Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: webkit/tools/test_shell/mock_webclipboard_impl.cc

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/test_shell/mock_webclipboard_impl.cc
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index c9c76480599ff1c3dde357fdffe5069a2c672239..9224b30b28d4ed82fc826a208ca26285925971fd 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -74,7 +74,8 @@ WebVector<WebString> MockWebClipboardImpl::readAvailableTypes(
if (!m_image.isNull()) {
results.push_back(WebString("image/png"));
}
- for (std::map<string16, string16>::const_iterator it = m_customData.begin();
+ for (std::map<base::string16, base::string16>::const_iterator it =
+ m_customData.begin();
it != m_customData.end(); ++it) {
CHECK(std::find(results.begin(), results.end(), it->first) ==
results.end());
@@ -127,7 +128,8 @@ WebKit::WebData MockWebClipboardImpl::readImage(
WebKit::WebString MockWebClipboardImpl::readCustomData(
WebKit::WebClipboard::Buffer buffer,
const WebKit::WebString& type) {
- std::map<string16, string16>::const_iterator it = m_customData.find(type);
+ std::map<base::string16, base::string16>::const_iterator it =
+ m_customData.find(type);
if (it != m_customData.end())
return it->second;
return WebKit::WebString();

Powered by Google App Engine
This is Rietveld 408576698