Convert GetDisplayStringInLTRDirectionality from wstring to string16.

chrome/browser/tab_contents/tab_contents.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 "chrome/browser/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 3144 matching lines @@
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearPath();
   replacements.ClearQuery();
   replacements.ClearRef();
   GURL clean_url = frame_url.ReplaceComponents(replacements);
 
   // TODO(brettw) it should be easier than this to do the correct language
   // handling without getting the accept language from the profile.
-  std::wstring base_address = gfx::ElideUrl(clean_url, gfx::Font(), 0,
-      UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)));
+  string16 base_address = WideToUTF16(gfx::ElideUrl(clean_url, gfx::Font(), 0,
+      UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages))));

[Evan Martin, 2010/08/18 00:38:08]

I think there's a GetStringUTF16 now

   // Force URL to have LTR directionality.
-  base::i18n::GetDisplayStringInLTRDirectionality(&base_address);
+  base_address = base::i18n::GetDisplayStringInLTRDirectionality(base_address);
 
-  return l10n_util::GetStringF(
+  return UTF16ToWide(l10n_util::GetStringFUTF16(
       is_alert ? IDS_JAVASCRIPT_ALERT_TITLE : IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
-      base_address);
+      base_address));
 }
 
 gfx::NativeWindow TabContents::GetMessageBoxRootWindow() {
   return view_->GetTopLevelNativeWindow();
 }
 
 void TabContents::OnMessageBoxClosed(IPC::Message* reply_msg,
                                      bool success,
                                      const std::wstring& prompt) {
   last_javascript_message_dismissal_ = base::TimeTicks::Now();
@@ skipping 117 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }