Move more uses of string16 to specify base::

ui/base/text/bytes_formatting.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 "ui/base/text/bytes_formatting.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 
 const int kSpeedStrings[] = {
   IDS_APP_BYTES_PER_SECOND,
   IDS_APP_KIBIBYTES_PER_SECOND,
   IDS_APP_MEBIBYTES_PER_SECOND,
   IDS_APP_GIBIBYTES_PER_SECOND,
   IDS_APP_TEBIBYTES_PER_SECOND,
   IDS_APP_PEBIBYTES_PER_SECOND
 };
 
-string16 FormatBytesInternal(int64 bytes,
-                             DataUnits units,
-                             bool show_units,
-                             const int* const suffix) {
+base::string16 FormatBytesInternal(int64 bytes,
+                                   DataUnits units,
+                                   bool show_units,
+                                   const int* const suffix) {
   DCHECK(units >= DATA_UNITS_BYTE && units <= DATA_UNITS_PEBIBYTE);
   if (bytes < 0) {
     NOTREACHED() << "Negative bytes value";
-    return string16();
+    return base::string16();
   }
 
   // Put the quantity in the right units.
   double unit_amount = static_cast<double>(bytes);
   for (int i = 0; i < units; ++i)
     unit_amount /= 1024.0;
 
   int fractional_digits = 0;
   if (bytes != 0 && units != DATA_UNITS_BYTE && unit_amount < 100)
     fractional_digits = 1;
 
-  string16 result = base::FormatDouble(unit_amount, fractional_digits);
+  base::string16 result = base::FormatDouble(unit_amount, fractional_digits);
 
   if (show_units)
     result = l10n_util::GetStringFUTF16(suffix[units], result);
 
   return result;
 }
 
 }  // namespace
 
 DataUnits GetByteDisplayUnits(int64 bytes) {
@@ skipping 17 matching lines @@
   int unit_index = arraysize(kUnitThresholds);
   while (--unit_index > 0) {
     if (bytes >= kUnitThresholds[unit_index])
       break;
   }
 
   DCHECK(unit_index >= DATA_UNITS_BYTE && unit_index <= DATA_UNITS_PEBIBYTE);
   return DataUnits(unit_index);
 }
 
-string16 FormatBytesWithUnits(int64 bytes, DataUnits units, bool show_units) {
+base::string16 FormatBytesWithUnits(int64 bytes,
+                                    DataUnits units,
+                                    bool show_units) {
   return FormatBytesInternal(bytes, units, show_units, kByteStrings);
 }
 
-string16 FormatSpeedWithUnits(int64 bytes, DataUnits units, bool show_units) {
+base::string16 FormatSpeedWithUnits(int64 bytes,
+                                    DataUnits units,
+                                    bool show_units) {
   return FormatBytesInternal(bytes, units, show_units, kSpeedStrings);
 }
 
-string16 FormatBytes(int64 bytes) {
+base::string16 FormatBytes(int64 bytes) {
   return FormatBytesWithUnits(bytes, GetByteDisplayUnits(bytes), true);
 }
 
-string16 FormatSpeed(int64 bytes) {
+base::string16 FormatSpeed(int64 bytes) {
   return FormatSpeedWithUnits(bytes, GetByteDisplayUnits(bytes), true);
 }
 
 }  // namespace ui