Index: content/test/mock_webclipboard_impl.cc |
diff --git a/content/test/mock_webclipboard_impl.cc b/content/test/mock_webclipboard_impl.cc |
index 1cfac9b1fadc0c81de95e2acc93319b46562da28..a0b44bd4d413de5129f3fec093762b14dc0f6442 100644 |
--- a/content/test/mock_webclipboard_impl.cc |
+++ b/content/test/mock_webclipboard_impl.cc |
@@ -20,10 +20,10 @@ |
#include "ui/gfx/size.h" |
#include "webkit/glue/webkit_glue.h" |
-using WebKit::WebDragData; |
-using WebKit::WebString; |
-using WebKit::WebURL; |
-using WebKit::WebVector; |
+using blink::WebDragData; |
+using blink::WebString; |
+using blink::WebURL; |
+using blink::WebVector; |
namespace content { |
@@ -86,15 +86,15 @@ WebVector<WebString> MockWebClipboardImpl::readAvailableTypes( |
return results; |
} |
-WebKit::WebString MockWebClipboardImpl::readPlainText( |
- WebKit::WebClipboard::Buffer buffer) { |
+blink::WebString MockWebClipboardImpl::readPlainText( |
+ blink::WebClipboard::Buffer buffer) { |
return m_plainText; |
} |
// TODO(wtc): set output argument *url. |
-WebKit::WebString MockWebClipboardImpl::readHTML( |
- WebKit::WebClipboard::Buffer buffer, |
- WebKit::WebURL* url, |
+blink::WebString MockWebClipboardImpl::readHTML( |
+ blink::WebClipboard::Buffer buffer, |
+ blink::WebURL* url, |
unsigned* fragmentStart, |
unsigned* fragmentEnd) { |
*fragmentStart = 0; |
@@ -102,8 +102,8 @@ WebKit::WebString MockWebClipboardImpl::readHTML( |
return m_htmlText; |
} |
-WebKit::WebData MockWebClipboardImpl::readImage( |
- WebKit::WebClipboard::Buffer buffer) { |
+blink::WebData MockWebClipboardImpl::readImage( |
+ blink::WebClipboard::Buffer buffer) { |
std::string data; |
std::vector<unsigned char> encoded_image; |
// TODO(dcheng): Verify that we can assume the image is ARGB8888. Note that |
@@ -126,19 +126,19 @@ WebKit::WebData MockWebClipboardImpl::readImage( |
return data; |
} |
-WebKit::WebString MockWebClipboardImpl::readCustomData( |
- WebKit::WebClipboard::Buffer buffer, |
- const WebKit::WebString& type) { |
+blink::WebString MockWebClipboardImpl::readCustomData( |
+ blink::WebClipboard::Buffer buffer, |
+ const blink::WebString& 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(); |
+ return blink::WebString(); |
} |
-void MockWebClipboardImpl::writeHTML(const WebKit::WebString& htmlText, |
- const WebKit::WebURL& url, |
- const WebKit::WebString& plainText, |
+void MockWebClipboardImpl::writeHTML(const blink::WebString& htmlText, |
+ const blink::WebURL& url, |
+ const blink::WebString& plainText, |
bool writeSmartPaste) { |
clear(); |
@@ -147,23 +147,23 @@ void MockWebClipboardImpl::writeHTML(const WebKit::WebString& htmlText, |
m_writeSmartPaste = writeSmartPaste; |
} |
-void MockWebClipboardImpl::writePlainText(const WebKit::WebString& plain_text) { |
+void MockWebClipboardImpl::writePlainText(const blink::WebString& plain_text) { |
clear(); |
m_plainText = plain_text; |
} |
-void MockWebClipboardImpl::writeURL(const WebKit::WebURL& url, |
- const WebKit::WebString& title) { |
+void MockWebClipboardImpl::writeURL(const blink::WebURL& url, |
+ const blink::WebString& title) { |
clear(); |
m_htmlText = WebString::fromUTF8(URLToMarkup(url, title)); |
m_plainText = url.spec().utf16(); |
} |
-void MockWebClipboardImpl::writeImage(const WebKit::WebImage& image, |
- const WebKit::WebURL& url, |
- const WebKit::WebString& title) { |
+void MockWebClipboardImpl::writeImage(const blink::WebImage& image, |
+ const blink::WebURL& url, |
+ const blink::WebString& title) { |
if (!image.isNull()) { |
clear(); |