4 files changed, 0 insertions, 28 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 2f915d8..91876c6 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -119,23 +119,6 @@ WebString WebClipboardImpl::readPlainText(Buffer buffer) {
   return WebString();
 }
 
-// TODO(dcheng): For backwards compatibility during the transition.
-WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url) {
-  ui::Clipboard::Buffer buffer_type;
-  if (!ConvertBufferType(buffer, &buffer_type))
-    return WebString();
-
-  string16 html_stdstr;
-  GURL gurl;
-  uint32 fragment_start = 0;
-  uint32 fragment_end = 0;
-  ClipboardReadHTML(buffer_type, &html_stdstr, &gurl, &fragment_start,
-                    &fragment_end);
-  if (fragment_start != std::string::npos && fragment_end != std::string::npos)
-    return html_stdstr.substr(fragment_start, fragment_end - fragment_start);
-  return WebString();
-}
-
 WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url,
                                      unsigned* fragment_start,
                                      unsigned* fragment_end) {
diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h
index 8661477..7d1adb7 100644
--- a/webkit/glue/webclipboard_impl.h
+++ b/webkit/glue/webclipboard_impl.h
@@ -24,10 +24,6 @@ class WebClipboardImpl : public WebKit::WebClipboard {
   // WebClipboard methods:
   virtual bool isFormatAvailable(Format, Buffer);
   virtual WebKit::WebString readPlainText(Buffer);
-  // TODO(dcheng): This method is deprecated and scheduled to be removed.
-  virtual WebKit::WebString readHTML(
-      Buffer,
-      WebKit::WebURL* source_url);
   virtual WebKit::WebString readHTML(
       Buffer,
       WebKit::WebURL* source_url,
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index 19a13e2..8219985 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -68,11 +68,6 @@ WebKit::WebString MockWebClipboardImpl::readPlainText(
 
 // TODO(wtc): set output argument *url.
 WebKit::WebString MockWebClipboardImpl::readHTML(
-    WebKit::WebClipboard::Buffer buffer, WebKit::WebURL* url) {
-  return m_htmlText;
-}
-
-WebKit::WebString MockWebClipboardImpl::readHTML(
     WebKit::WebClipboard::Buffer buffer, WebKit::WebURL* url,
     unsigned* fragmentStart, unsigned* fragmentEnd) {
   *fragmentStart = 0;
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/tools/test_shell/mock_webclipboard_impl.h
index d91de01..e51b2b6 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.h
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.h
@@ -23,8 +23,6 @@ class MockWebClipboardImpl : public WebKit::WebClipboard {
 
   virtual WebKit::WebString readPlainText(WebKit::WebClipboard::Buffer);
   virtual WebKit::WebString readHTML(WebKit::WebClipboard::Buffer,
-                                     WebKit::WebURL*);
-  virtual WebKit::WebString readHTML(WebKit::WebClipboard::Buffer,
                                      WebKit::WebURL*,
                                      unsigned* fragmentStart,
                                      unsigned* fragmentEnd);