Fix a problem in the implementation of search-vs.-go-in-context-menus. We we...

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2009 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/tab_contents/render_view_context_menu.h"
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "webkit/api/public/WebMediaPlayerAction.h"
 #include "webkit/api/public/WebContextMenuData.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebMediaPlayerAction;
 
-namespace {
-
-string16 EscapeAmpersands(const string16& text) {
-  string16 ret;
-  ret.reserve(text.length() * 2);
-  for (string16::const_iterator i = text.begin();
-       i != text.end(); ++i) {
-    // The escape for an ampersand is two ampersands.
-    if ('&' == *i)
-      ret.push_back(*i);
-
-    ret.push_back(*i);
-  }
-
-  return ret;
-}
-
-}  // namespace
-
 RenderViewContextMenu::RenderViewContextMenu(
     TabContents* tab_contents,
     const ContextMenuParams& params)
     : params_(params),
       source_tab_contents_(tab_contents),
       profile_(tab_contents->profile()) {
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() {
 }
@@ skipping 143 matching lines @@
   AppendMenuItem(IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE);
   AppendMenuItem(IDS_CONTENT_CONTEXT_VIEWFRAMEINFO);
 }
 
 void RenderViewContextMenu::AppendCopyItem() {
   AppendMenuItem(IDS_CONTENT_CONTEXT_COPY);
 }
 
 void RenderViewContextMenu::AppendSearchProvider() {
   DCHECK(profile_);
-  const TemplateURL* const default_provider =
-      profile_->GetTemplateURLModel()->GetDefaultSearchProvider();
-  if (!default_provider)
-    return;
 
-  string16 selection_text = EscapeAmpersands(WideToUTF16(
-      l10n_util::TruncateString(params_.selection_text, 50)));
-  if (selection_text.empty())
+  if (params_.selection_text.empty())
     return;
 
   bool is_search;
   profile_->GetSearchVersusNavigateClassifier()->Classify(
-      UTF16ToWide(selection_text), std::wstring(), &is_search,
+      params_.selection_text, std::wstring(), &is_search,
       &selection_navigation_url_, &transition_, NULL, NULL);
   if (!selection_navigation_url_.is_valid())
     return;
 
+  string16 printable_selection_text(
+      WideToUTF16(l10n_util::TruncateString(params_.selection_text, 50)));
+  // Escape "&" as "&&".
+  for (size_t i = printable_selection_text.find('&'); i != string16::npos;
+       i = printable_selection_text.find('&', i + 2))
+    printable_selection_text.insert(i, 1, '&');
+
   if (is_search) {
-    string16 label(l10n_util::GetStringFUTF16(
-        IDS_CONTENT_CONTEXT_SEARCHWEBFOR,
-        WideToUTF16(default_provider->short_name()),
-        selection_text));
-    AppendMenuItem(IDS_CONTENT_CONTEXT_SEARCHWEBFOR, label);
+    const TemplateURL* const default_provider =
+        profile_->GetTemplateURLModel()->GetDefaultSearchProvider();
+    if (!default_provider)
+      return;
+    AppendMenuItem(IDS_CONTENT_CONTEXT_SEARCHWEBFOR,
+                   l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_SEARCHWEBFOR,
+                       WideToUTF16(default_provider->short_name()),
+                       printable_selection_text));
   } else {
-    string16 label(l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_GOTOURL,
-                                              selection_text));
-    AppendMenuItem(IDS_CONTENT_CONTEXT_GOTOURL, label);
+    AppendMenuItem(IDS_CONTENT_CONTEXT_GOTOURL,
+                   l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_GOTOURL,
+                                              printable_selection_text));
   }
 }
 
 void RenderViewContextMenu::AppendEditableItems() {
   // Append Dictionary spell check suggestions.
   for (size_t i = 0; i < params_.dictionary_suggestions.size() &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        ++i) {
     AppendMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
                    params_.dictionary_suggestions[i]);
@@ skipping 567 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->MediaPlayerActionAt(
       location, action);
 }