Provide a wstring-free version of FormatUrl(), part 1.

I haven't converted the code yet -- the new version just calls the old (wstring)
version and does conversions. But I converted the unit test, so that when I do
convert the code I'll know it works correctly.

BUG=23581
TEST=unit test

Review URL: http://codereview.chromium.org/3152048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57336 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 0 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index d0b034b..202f5fc 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -1621,6 +1621,19 @@ std::wstring FormatUrl(const GURL& url,
   return url_string;
 }
 
+// TODO(viettrungluu): convert the code in wstring version to this form.
+string16 FormatUrl(const GURL& url,
+                   const std::string& languages,
+                   FormatUrlTypes format_types,
+                   UnescapeRule::Type unescape_rules,
+                   url_parse::Parsed* new_parsed,
+                   size_t* prefix_end,
+                   size_t* offset_for_adjustment) {
+  return WideToUTF16Hack(
+      FormatUrl(url, ASCIIToWide(languages), format_types, unescape_rules,
+                new_parsed, prefix_end, offset_for_adjustment));
+}
+
 bool CanStripTrailingSlash(const GURL& url) {
   // Omit the path only for standard, non-file URLs with nothing but "/" after
   // the hostname.