diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:21:57 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:21:57 +0000 |
| commit | 3774f835ddbe5005ad49c5a1818b3fcbfff4f703 (patch) | |
| tree | 57fc897925de5dffb8e66cc2f4cdf23a8f3762f0 /url/url_canon_stdurl.cc | |
| parent | e8eecbf087af308f5dd0440923ea85f877041e2b (diff) | |
| download | chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.zip chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.tar.gz chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.tar.bz2 | |
Use base:: on string16 and char16 in net/ and url/
BUG=none
TEST=no change
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/16413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_stdurl.cc')
| -rw-r--r-- | url/url_canon_stdurl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/url/url_canon_stdurl.cc b/url/url_canon_stdurl.cc index 66f5218..548dc99 100644 --- a/url/url_canon_stdurl.cc +++ b/url/url_canon_stdurl.cc @@ -134,14 +134,14 @@ bool CanonicalizeStandardURL(const char* spec, output, new_parsed); } -bool CanonicalizeStandardURL(const char16* spec, +bool CanonicalizeStandardURL(const base::char16* spec, int spec_len, const url_parse::Parsed& parsed, CharsetConverter* query_converter, CanonOutput* output, url_parse::Parsed* new_parsed) { - return DoCanonicalizeStandardURL<char16, char16>( - URLComponentSource<char16>(spec), parsed, query_converter, + return DoCanonicalizeStandardURL<base::char16, base::char16>( + URLComponentSource<base::char16>(spec), parsed, query_converter, output, new_parsed); } @@ -171,7 +171,7 @@ bool ReplaceStandardURL(const char* base, // regular codepath can be used. bool ReplaceStandardURL(const char* base, const url_parse::Parsed& base_parsed, - const Replacements<char16>& replacements, + const Replacements<base::char16>& replacements, CharsetConverter* query_converter, CanonOutput* output, url_parse::Parsed* new_parsed) { |