Revert 111548 - Broke OmniboxViewTest.AcceptKeywordBySpace on Linux

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversion_utils.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 849 matching lines @@
 int OmniboxViewGtk::OnPerformDrop(
     const views::DropTargetEvent& event) {
   string16 text;
   const ui::OSExchangeData& data = event.data();
   if (data.HasURL()) {
     GURL url;
     string16 title;
     if (data.GetURLAndTitle(&url, &title))
       text = UTF8ToUTF16(url.spec());
   } else {
-    data.GetString(&text);
+    string16 data_string;
+    if (data.GetString(&data_string))
+      text = CollapseWhitespace(data_string, true);
   }
 
   if (!text.empty() && OnPerformDropImpl(text))
     return CopyOrLinkDragOperation(event.source_operations());
 
   return ui::DragDropTypes::DRAG_NONE;
 }
 #endif  // defined(TOOLKIT_VIEWS)
 
 void OmniboxViewGtk::Observe(int type,
@@ skipping 543 matching lines @@
   gtk_widget_set_sensitive(search_engine_menuitem,
       command_updater_->IsCommandEnabled(IDC_EDIT_SEARCH_ENGINES));
   gtk_widget_show(search_engine_menuitem);
 
   // We need to update the paste and go controller before we know what text
   // to show. We could do this all asynchronously, but it would be elaborate
   // because we'd have to account for multiple menus showing, getting called
   // back after shutdown, and similar issues.
   GtkClipboard* x_clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
   gchar* text = gtk_clipboard_wait_for_text(x_clipboard);
-  string16 sanitized_text(text ?
-      StripJavascriptSchemas(CollapseWhitespace(UTF8ToUTF16(text), true)) :
-      string16());
+  string16 text_wstr = UTF8ToUTF16(text ? text : "");
   g_free(text);
 
-  // Paste and Go menu item. Note that CanPasteAndGo() needs to be called
-  // before is_paste_and_search() in order to set up the paste-and-go state.
-  bool can_paste_and_go = model_->CanPasteAndGo(sanitized_text);
+  // Paste and Go menu item.
   GtkWidget* paste_go_menuitem = gtk_menu_item_new_with_mnemonic(
       gfx::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(model_->is_paste_and_search() ?
               IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO)).c_str());
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), paste_go_menuitem);
   g_signal_connect(paste_go_menuitem, "activate",
                    G_CALLBACK(HandlePasteAndGoThunk), this);
-  gtk_widget_set_sensitive(paste_go_menuitem, can_paste_and_go);
+  gtk_widget_set_sensitive(paste_go_menuitem,
+                           model_->CanPasteAndGo(text_wstr));
   gtk_widget_show(paste_go_menuitem);
 
   g_signal_connect(menu, "deactivate",
                    G_CALLBACK(HandlePopupMenuDeactivateThunk), this);
 }
 
 void OmniboxViewGtk::HandleEditSearchEngines(GtkWidget* sender) {
   command_updater_->ExecuteCommand(IDC_EDIT_SEARCH_ENGINES);
 }
 
@@ skipping 155 matching lines @@
   GtkTargetList* copy_targets =
       gtk_text_buffer_get_copy_target_list(text_buffer_);
   gtk_target_list_remove(copy_targets, atom);
   dragged_text_.clear();
 }
 
 void OmniboxViewGtk::HandleInsertText(GtkTextBuffer* buffer,
                                       GtkTextIter* location,
                                       const gchar* text,
                                       gint len) {
-  string16 filtered_text;
+  std::string filtered_text;
   filtered_text.reserve(len);
 
   // Filter out new line and tab characters.
   // |text| is guaranteed to be a valid UTF-8 string, so we don't need to
   // validate it here.
   //
   // If there was only a single character, then it might be generated by a key
   // event. In this case, we save the single character to help our
   // "key-press-event" signal handler distinguish if an Enter key event is
   // handled by IME or not.
   if (len == 1 && (text[0] == '\n' || text[0] == '\r'))
     enter_was_inserted_ = true;
 
-  for (const gchar* p = text; *p && (p - text) < len;
-       p = g_utf8_next_char(p)) {
+  const gchar* p = text;
+  while (*p && (p - text) < len) {
     gunichar c = g_utf8_get_char(p);
+    const gchar* next = g_utf8_next_char(p);
 
     // 0x200B is Zero Width Space, which is inserted just before the instant
     // anchor for working around the GtkTextView's misalignment bug.
     // This character might be captured and inserted into the content by undo
     // manager, so we need to filter it out here.
-    if (c != 0x200B)
-      base::WriteUnicodeCharacter(c, &filtered_text);
+    if (c != L'\n' && c != L'\r' && c != L'\t' && c != 0x200B)
+      filtered_text.append(p, next);
+
+    p = next;
   }
 
-  if (model_->is_pasting())
-    filtered_text = StripJavascriptSchemas(
-        CollapseWhitespace(filtered_text, true));
-
-  if (!filtered_text.empty()) {
+  if (filtered_text.length()) {
     // Avoid inserting the text after the instant anchor.
     ValidateTextBufferIter(location);
 
     // Call the default handler to insert filtered text.
     GtkTextBufferClass* klass = GTK_TEXT_BUFFER_GET_CLASS(buffer);
-    std::string utf8_text = UTF16ToUTF8(filtered_text);
-    klass->insert_text(buffer, location, utf8_text.data(),
-                       static_cast<gint>(utf8_text.length()));
+    klass->insert_text(buffer, location, filtered_text.data(),
+                       static_cast<gint>(filtered_text.length()));
   }
 
   // Stop propagating the signal emission to prevent the default handler from
   // being called again.
   static guint signal_id = g_signal_lookup("insert-text", GTK_TYPE_TEXT_BUFFER);
   g_signal_stop_emission(buffer, signal_id, 0);
 }
 
 void OmniboxViewGtk::HandleBackSpace(GtkWidget* sender) {
   // Checks if it's currently in keyword search mode.
@@ skipping 106 matching lines @@
                            0);
 
     if (!copy && gtk_text_view_get_editable(GTK_TEXT_VIEW(text_view_)))
       gtk_text_buffer_delete_selection(text_buffer_, true, true);
   }
 
   OwnPrimarySelection(UTF16ToUTF8(text));
 }
 
 bool OmniboxViewGtk::OnPerformDropImpl(const string16& text) {
-  if (model_->CanPasteAndGo(StripJavascriptSchemas(
-      CollapseWhitespace(text, true)))) {
+  if (model_->CanPasteAndGo(CollapseWhitespace(text, true))) {
     model_->PasteAndGo();
     return true;
   }
 
   return false;
 }
 
 gfx::Font OmniboxViewGtk::GetFont() {
 #if defined(TOOLKIT_VIEWS)
   bool use_gtk = false;
@@ skipping 585 matching lines @@
 
   // Make all the children of the widget visible. NOTE: this won't display
   // anything, it just toggles the visible flag.
   gtk_widget_show_all(omnibox_view->GetNativeView());
   // Hide the widget. NativeViewHostGtk will make it visible again as necessary.
   gtk_widget_hide(omnibox_view->GetNativeView());
 
   return omnibox_view;
 }
 #endif