webkit: use string16 in ContextMenuParams

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <set>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_event_router.h"
@@ skipping 541 matching lines @@
 }
 
 void RenderViewContextMenu::AppendSearchProvider() {
   DCHECK(profile_);
 
   TrimWhitespace(params_.selection_text, TRIM_ALL, &params_.selection_text);
   if (params_.selection_text.empty())
     return;
 
   AutocompleteMatch match;
-  profile_->GetAutocompleteClassifier()->Classify(params_.selection_text,
+  profile_->GetAutocompleteClassifier()->Classify(
+      UTF16ToWideHack(params_.selection_text),
       std::wstring(), false, &match, NULL);
   selection_navigation_url_ = match.destination_url;
   if (!selection_navigation_url_.is_valid())
     return;
 
   string16 printable_selection_text = PrintableSelectionText();
   // 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, '&');
@@ skipping 834 matching lines @@
     // Don't enable the web inspector if the developer tools are disabled via
     // the preference dev-tools-disabled.
     if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
       return false;
   }
 
   return true;
 }
 
 string16 RenderViewContextMenu::PrintableSelectionText() {
-  return l10n_util::TruncateString(WideToUTF16Hack(params_.selection_text),
+  return l10n_util::TruncateString(params_.selection_text,
                                    kMaxSelectionTextLength);
 }
 
 // Controller functions --------------------------------------------------------
 
 void RenderViewContextMenu::OpenURL(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition) {
   source_tab_contents_->OpenURL(url, GURL(), disposition, transition);
@@ skipping 16 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);
 }