Convert GetDisplayStringInLTRDirectionality from wstring to string16.

chrome/browser/download/download_item_model.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/download/download_item_model.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
@@ skipping 22 matching lines @@
 
   DataUnits amount_units = GetByteDisplayUnits(total);
   const string16 simple_size = WideToUTF16Hack(FormatBytes(size, amount_units,
                                                            false));
 
   // In RTL locales, we render the text "size/total" in an RTL context. This
   // is problematic since a string such as "123/456 MB" is displayed
   // as "MB 123/456" because it ends with an LTR run. In order to solve this,
   // we mark the total string as an LTR string if the UI layout is
   // right-to-left so that the string "456 MB" is treated as an LTR run.
-  std::wstring simple_total = FormatBytes(total, amount_units, true);
-  base::i18n::GetDisplayStringInLTRDirectionality(&simple_total);
+  string16 simple_total = WideToUTF16Hack(FormatBytes(total, amount_units,
+                                                      true));
+  simple_total = base::i18n::GetDisplayStringInLTRDirectionality(simple_total);
 
   TimeDelta remaining;
   string16 simple_time;
   if (download_->state() == DownloadItem::IN_PROGRESS &&
       download_->is_paused()) {
     simple_time = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   } else if (download_->TimeRemaining(&remaining)) {
     simple_time = download_->open_when_complete() ?
                       TimeFormat::TimeRemainingShort(remaining) :
                       TimeFormat::TimeRemaining(remaining);
@@ skipping 12 matching lines @@
         }
       } else {
         if (simple_time.empty()) {
           // Instead of displaying "0 B" we keep the "Starting..." string.
           status_text = (size == 0) ?
               l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING) :
               WideToUTF16Hack(FormatBytes(size, GetByteDisplayUnits(size),
                                           true));
         } else {
           status_text = l10n_util::GetStringFUTF16(
-              IDS_DOWNLOAD_STATUS_IN_PROGRESS, simple_size,
-              WideToUTF16Hack(simple_total), simple_time);
+              IDS_DOWNLOAD_STATUS_IN_PROGRESS, simple_size, simple_total,
+              simple_time);
         }
       }
       break;
     case DownloadItem::COMPLETE:
       status_text.clear();
       break;
     case DownloadItem::CANCELLED:
       status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_CANCELED);
       break;
     case DownloadItem::REMOVING:
@@ skipping 36 matching lines @@
       status_text = l10n_util::GetString(IDS_SAVE_PAGE_STATUS_CANCELED);
       break;
     case DownloadItem::REMOVING:
       break;
     default:
       NOTREACHED();
   }
 
   return status_text;
 }