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

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1596 matching lines @@
   // be available.
   omnibox_view->SelectAll(true);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->Clear(ui::Clipboard::BUFFER_STANDARD);
   EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_COPY));
   EXPECT_EQ(ASCIIToUTF16(target_url), omnibox_view->GetText());
   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)
+  // Mac and Windows don't write HTML.
+#if !defined(OS_MACOSX) && !defined(OS_WIN)

[Peter Kasting, 2013/10/05 00:42:27]

Seems like on these platforms we should EXPECT_FALSE instead (2 places).

[scottmg, 2013/10/07 22:16:27]

Done.

   EXPECT_TRUE(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)
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   EXPECT_EQ(target_url, url);
@@ skipping 25 matching lines @@
   // in the clipboard.
   omnibox_view->SelectAll(true);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->Clear(ui::Clipboard::BUFFER_STANDARD);
   EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_CUT));
   EXPECT_EQ(string16(), omnibox_view->GetText());
   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)
+  // Mac and Windows don't write HTML.
+#if !defined(OS_MACOSX) && !defined(OS_WIN)
   EXPECT_TRUE(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)
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   EXPECT_EQ(target_url, url);
@@ skipping 174 matching lines @@
   omnibox_view->Update();
   EXPECT_EQ(url_c, omnibox_view->GetText());
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, InputResetsSearchTermReplacement) {
   browser()->toolbar_model()->set_search_term_replacement_enabled(false);
   chrome::FocusLocationBar(browser());
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0));
   EXPECT_TRUE(browser()->toolbar_model()->search_term_replacement_enabled());
 }