Don't write URLs to clipboard from views omnibox as hyperlinks

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 9f39b0e20e701743e6be1448a399f816ec0bf3dc..566f52ead86811bb9371734763b0a2cb0564426c 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -1614,11 +1614,9 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) {
   EXPECT_TRUE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetPlainTextFormatType(), ui::Clipboard::BUFFER_STANDARD));
 
-  // The Mac is the only platform which doesn't write html.
-#if !defined(OS_MACOSX)
-  EXPECT_TRUE(clipboard->IsFormatAvailable(
+  // Make sure HTML format isn't written. http://crbug.com/976.

[Peter Kasting, 2013/10/07 22:19:23]

Nit: Don't refer to a bug number here; if any more explanation is needed than
the first sentence, either explain inline, or refer readers to the comment in
BookmarkNodeData::WriteToClipboard() for details.  (2 places)

+  EXPECT_FALSE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetHtmlFormatType(), ui::Clipboard::BUFFER_STANDARD));
-#endif
 
   // These platforms should read bookmark format.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
@@ -1661,11 +1659,9 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CutURLToClipboard) {
   EXPECT_TRUE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetPlainTextFormatType(), ui::Clipboard::BUFFER_STANDARD));
 
-  // The Mac is the only platform which doesn't write html.
-#if !defined(OS_MACOSX)
-  EXPECT_TRUE(clipboard->IsFormatAvailable(
+  // Make sure HTML format isn't written. http://crbug.com/976.
+  EXPECT_FALSE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetHtmlFormatType(), ui::Clipboard::BUFFER_STANDARD));
-#endif
 
   // These platforms should read bookmark format.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)