Move more uses of string16 to specify base::

ui/base/text/bytes_formatting.cc

Index: ui/base/text/bytes_formatting.cc
diff --git a/ui/base/text/bytes_formatting.cc b/ui/base/text/bytes_formatting.cc
index db3537287f26ffe4bc4ac93afeea5b4f4998d4fa..02bf55c8b973e944d002125c1b640df8123810c5 100644
--- a/ui/base/text/bytes_formatting.cc
+++ b/ui/base/text/bytes_formatting.cc
@@ -34,14 +34,14 @@ const int kSpeedStrings[] = {
   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.
@@ -53,7 +53,7 @@ string16 FormatBytesInternal(int64 bytes,
   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);
@@ -91,19 +91,23 @@ DataUnits GetByteDisplayUnits(int64 bytes) {
   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);
 }