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_path.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_path.cc')
| -rw-r--r-- | url/url_canon_path.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/url/url_canon_path.cc b/url/url_canon_path.cc index 6e34b3b..f42af68 100644 --- a/url/url_canon_path.cc +++ b/url/url_canon_path.cc @@ -326,11 +326,11 @@ bool CanonicalizePath(const char* spec, return DoPath<char, unsigned char>(spec, path, output, out_path); } -bool CanonicalizePath(const char16* spec, +bool CanonicalizePath(const base::char16* spec, const url_parse::Component& path, CanonOutput* output, url_parse::Component* out_path) { - return DoPath<char16, char16>(spec, path, output, out_path); + return DoPath<base::char16, base::char16>(spec, path, output, out_path); } bool CanonicalizePartialPath(const char* spec, @@ -341,12 +341,13 @@ bool CanonicalizePartialPath(const char* spec, output); } -bool CanonicalizePartialPath(const char16* spec, +bool CanonicalizePartialPath(const base::char16* spec, const url_parse::Component& path, int path_begin_in_output, CanonOutput* output) { - return DoPartialPath<char16, char16>(spec, path, path_begin_in_output, - output); + return DoPartialPath<base::char16, base::char16>(spec, path, + path_begin_in_output, + output); } } // namespace url_canon |