Cleanup AdjustStringForLocaleDirection()

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 526 matching lines @@
 std::wstring GetProgressStatusText(DownloadItem* download) {
   int64 total = download->total_bytes();
   int64 size = download->received_bytes();
   DataUnits amount_units = GetByteDisplayUnits(size);
   std::wstring received_size = UTF16ToWideHack(FormatBytes(size, amount_units,
                                                            true));
   std::wstring amount = received_size;
 
   // Adjust both strings for the locale direction since we don't yet know which
   // string we'll end up using for constructing the final progress string.
-  std::wstring amount_localized;
-  if (base::i18n::AdjustStringForLocaleDirection(amount, &amount_localized)) {
-    amount.assign(amount_localized);
-    received_size.assign(amount_localized);
-  }
+  base::i18n::AdjustStringForLocaleDirection(&amount);
 
   if (total) {
     amount_units = GetByteDisplayUnits(total);
     std::wstring total_text =
         UTF16ToWideHack(FormatBytes(total, amount_units, true));
-    std::wstring total_text_localized;
-    if (base::i18n::AdjustStringForLocaleDirection(total_text,
-                                                   &total_text_localized))
-      total_text.assign(total_text_localized);
+    base::i18n::AdjustStringForLocaleDirection(&total_text);
 
+    base::i18n::AdjustStringForLocaleDirection(&received_size);
     amount = l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SIZE,
                                    received_size,
                                    total_text);
   } else {
     amount.assign(received_size);
   }
   int64 current_speed = download->CurrentSpeed();
   amount_units = GetByteDisplayUnits(current_speed);
   std::wstring speed_text = UTF16ToWideHack(FormatSpeed(current_speed,
                                                         amount_units, true));
-  std::wstring speed_text_localized;
-  if (base::i18n::AdjustStringForLocaleDirection(speed_text,
-                                                 &speed_text_localized))
-    speed_text.assign(speed_text_localized);
+  base::i18n::AdjustStringForLocaleDirection(&speed_text);
 
   base::TimeDelta remaining;
   string16 time_remaining;
   if (download->is_paused())
     time_remaining = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   else if (download->TimeRemaining(&remaining))
     time_remaining = TimeFormat::TimeRemaining(remaining);
 
   if (time_remaining.empty()) {
+    base::i18n::AdjustStringForLocaleDirection(&amount);
     return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS_TIME_UNKNOWN,
                                  speed_text, amount);
   }
   return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, speed_text,
                                amount, UTF16ToWideHack(time_remaining));
 }
 
 #if !defined(OS_MACOSX)
 void UpdateAppIconDownloadProgress(int download_count,
                                    bool progress_known,
@@ skipping 146 matching lines @@
     ExtensionsService* service = profile->GetExtensionsService();
     if (!service ||
         !service->IsDownloadFromGallery(info->url, info->referrer_url)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace download_util