Use base:: on string16 and char16 in net/ and url/
BUG=none
TEST=no change
[email protected]
Review URL: https://codereview.chromium.org/16413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205636 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/url/url_canon_filesystemurl.cc b/url/url_canon_filesystemurl.cc
index e563309..7f1d393 100644
--- a/url/url_canon_filesystemurl.cc
+++ b/url/url_canon_filesystemurl.cc
@@ -92,15 +92,15 @@
new_parsed);
}
-bool CanonicalizeFileSystemURL(const char16* spec,
+bool CanonicalizeFileSystemURL(const base::char16* spec,
int spec_len,
const url_parse::Parsed& parsed,
CharsetConverter* charset_converter,
CanonOutput* output,
url_parse::Parsed* new_parsed) {
- return DoCanonicalizeFileSystemURL<char16, char16>(
- spec, URLComponentSource<char16>(spec), parsed, charset_converter, output,
- new_parsed);
+ return DoCanonicalizeFileSystemURL<base::char16, base::char16>(
+ spec, URLComponentSource<base::char16>(spec), parsed, charset_converter,
+ output, new_parsed);
}
bool ReplaceFileSystemURL(const char* base,
@@ -118,7 +118,7 @@
bool ReplaceFileSystemURL(const char* base,
const url_parse::Parsed& base_parsed,
- const Replacements<char16>& replacements,
+ const Replacements<base::char16>& replacements,
CharsetConverter* charset_converter,
CanonOutput* output,
url_parse::Parsed* new_parsed) {
