Localize strings, speeds.

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2011 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/chromeos/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/icu_encoding_detection.h"
@@ skipping 10 matching lines @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/network_login_observer.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/browser_thread.h"
 #include "crypto/nss_util.h"  // crypto::GetTPMTokenInfo() for 802.1X and VPN.
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation notes.
 // NetworkLibraryImpl manages a series of classes that describe network devices
 // and services:
 //
 // NetworkDevice: e.g. ethernet, wifi modem, cellular modem
 //  device_map_: canonical map<path,NetworkDevice*> for devices
 //
 // Network: a network service ("network").
@@ skipping 1482 matching lines @@
   switch (plan_type) {
     case chromeos::CELLULAR_DATA_PLAN_UNLIMITED: {
       return l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PURCHASE_UNLIMITED_DATA,
           base::TimeFormatFriendlyDate(plan_start_time));
       break;
     }
     case chromeos::CELLULAR_DATA_PLAN_METERED_PAID: {
       return l10n_util::GetStringFUTF16(
                 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PURCHASE_DATA,
-                FormatBytes(plan_data_bytes,
-                            GetByteDisplayUnits(plan_data_bytes),
-                            true),
+                ui::FormatBytes(plan_data_bytes),
                 base::TimeFormatFriendlyDate(plan_start_time));
     }
     case chromeos::CELLULAR_DATA_PLAN_METERED_BASE: {
       return l10n_util::GetStringFUTF16(
                 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_RECEIVED_FREE_DATA,
-                FormatBytes(plan_data_bytes,
-                            GetByteDisplayUnits(plan_data_bytes),
-                            true),
+                ui::FormatBytes(plan_data_bytes),
                 base::TimeFormatFriendlyDate(plan_start_time));
     default:
       break;
     }
   }
   return string16();
 }
 
 string16 CellularDataPlan::GetRemainingWarning() const {
   if (plan_type == chromeos::CELLULAR_DATA_PLAN_UNLIMITED) {
@@ skipping 15 matching lines @@
 }
 
 string16 CellularDataPlan::GetDataRemainingDesciption() const {
   int64 remaining_bytes = remaining_data();
   switch (plan_type) {
     case chromeos::CELLULAR_DATA_PLAN_UNLIMITED: {
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_UNLIMITED);
     }
     case chromeos::CELLULAR_DATA_PLAN_METERED_PAID: {
-      return FormatBytes(remaining_bytes,
-          GetByteDisplayUnits(remaining_bytes),
-          true);
+      return ui::FormatBytes(remaining_bytes);
     }
     case chromeos::CELLULAR_DATA_PLAN_METERED_BASE: {
-      return FormatBytes(remaining_bytes,
-          GetByteDisplayUnits(remaining_bytes),
-          true);
+      return ui::FormatBytes(remaining_bytes);
     }
     default:
       break;
   }
   return string16();
 }
 
 string16 CellularDataPlan::GetUsageInfo() const {
   if (plan_type == chromeos::CELLULAR_DATA_PLAN_UNLIMITED) {
     // Time based plan. Show nearing expiration and data expiration.
@@ skipping 3473 matching lines @@
     return new NetworkLibraryStubImpl();
   else
     return new NetworkLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImpl);