diff options
| -rw-r--r-- | base/clipboard_unittest.cc | 6 | ||||
| -rw-r--r-- | base/clipboard_util.cc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/base/clipboard_unittest.cc b/base/clipboard_unittest.cc index 17ceba8..fb48b49 100644 --- a/base/clipboard_unittest.cc +++ b/base/clipboard_unittest.cc @@ -53,7 +53,7 @@ TEST_F(ClipboardTest, TextTest) { EXPECT_EQ(WideToUTF8(text), ascii_text); } -TEST_F(ClipboardTest, DISABLED_HTMLTest) { +TEST_F(ClipboardTest, HTMLTest) { Clipboard clipboard; std::wstring markup(L"<string>Hi!</string>"), markup_result; @@ -75,7 +75,7 @@ TEST_F(ClipboardTest, DISABLED_HTMLTest) { #endif } -TEST_F(ClipboardTest, DISABLED_TrickyHTMLTest) { +TEST_F(ClipboardTest, TrickyHTMLTest) { Clipboard clipboard; std::wstring markup(L"<em>Bye!<!--EndFragment --></em>"), markup_result; @@ -118,7 +118,7 @@ TEST_F(ClipboardTest, BookmarkTest) { } #endif -TEST_F(ClipboardTest, DISABLED_MultiFormatTest) { +TEST_F(ClipboardTest, MultiFormatTest) { Clipboard clipboard; std::wstring text(L"Hi!"), text_result; diff --git a/base/clipboard_util.cc b/base/clipboard_util.cc index 5b64732..a9e7d2a 100644 --- a/base/clipboard_util.cc +++ b/base/clipboard_util.cc @@ -466,6 +466,7 @@ void ClipboardUtil::CFHtmlToHtml(const std::string& cf_html, size_t src_start = line_start + src_url_str.length(); if (src_end != std::string::npos && src_start != std::string::npos) { *base_url = cf_html.substr(src_start, src_end - src_start); + TrimWhitespace(*base_url, TRIM_ALL, base_url); } } @@ -474,7 +475,7 @@ void ClipboardUtil::CFHtmlToHtml(const std::string& cf_html, size_t markup_start = cf_html_lower.find("<html", 0); size_t tag_start = cf_html.find("StartFragment", markup_start); size_t fragment_start = cf_html.find('>', tag_start) + 1; - size_t tag_end = cf_html.find("EndFragment", fragment_start); + size_t tag_end = cf_html.rfind("EndFragment", std::string::npos); size_t fragment_end = cf_html.rfind('<', tag_end); if (fragment_start != std::string::npos && fragment_end != std::string::npos) { |