Remove deprecated WebClipboard::readHTML method.

ui/base/clipboard/clipboard_win.cc

Index: ui/base/clipboard/clipboard_win.cc
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index a2c515b343072938dc3ab2bb685468438525840e..b61242544689d12b4e925508f8ecc225e08b52e0 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -453,17 +453,19 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
   size_t end_index = std::string::npos;
   ClipboardUtil::CFHtmlExtractMetadata(cf_html, src_url, &html_start,
                                        &start_index, &end_index);
-  if (markup) {
-    // Some sanity checks...
-    DCHECK(start_index != std::string::npos);
-    DCHECK(end_index != std::string::npos);
-    DCHECK((start_index - html_start) <= kuint32max);
-    DCHECK((end_index - html_start) <= kuint32max);
-
-    markup->assign(UTF8ToWide(cf_html.data() + html_start));
-    *fragment_start = static_cast<uint32>(start_index - html_start);
-    *fragment_end = static_cast<uint32>(end_index - html_start);
-  }
+  // This might happen if the contents of the clipboard changed and CF_HTML is
+  // no longer available.
+  if (start_index == std::string::npos ||
+      end_index == std::string::npos ||
+      html_start == std::string::npos)
+    return;
+
+  DCHECK((start_index - html_start) <= kuint32max);
+  DCHECK((end_index - html_start) <= kuint32max);

[tony, 2011/10/14 23:11:40]

Do we also need to check that start_index - html_start > 0 and end_index -
html_start > 0?

+
+  markup->assign(UTF8ToWide(cf_html.data() + html_start));
+  *fragment_start = static_cast<uint32>(start_index - html_start);
+  *fragment_end = static_cast<uint32>(end_index - html_start);
 }
 
 SkBitmap Clipboard::ReadImage(Buffer buffer) const {