summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 21:59:31 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 21:59:31 +0000
commitc3265d8866e5b0d2c1b129e4da685755a35a84b2 (patch)
tree276afaff1dee110f08bc0e2999dc55ce82e6db95 /net/base
parent147af6dcdc20b7162ed186ab18eeced8123ba9a0 (diff)
downloadchromium_src-c3265d8866e5b0d2c1b129e4da685755a35a84b2.zip
chromium_src-c3265d8866e5b0d2c1b129e4da685755a35a84b2.tar.gz
chromium_src-c3265d8866e5b0d2c1b129e4da685755a35a84b2.tar.bz2
Revert "Convert FormatBytes to string16."
This reverts commit r56603. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/net_util.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index d0b034b..a125664 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -1055,8 +1055,7 @@ std::string GetDirectoryListingEntry(const string16& name,
}
base::JsonDoubleQuote(
- FormatBytes(size, GetByteDisplayUnits(size), true),
- true,
+ WideToUTF16Hack(FormatBytes(size, GetByteDisplayUnits(size), true)), true,
&result);
result.append(",");