diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
| commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
| tree | badea60062e611382d8a37e3b0bfda8d69760c2b /url/url_canon_icu.cc | |
| parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
| download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'url/url_canon_icu.cc')
| -rw-r--r-- | url/url_canon_icu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc index cabbbf2ae8..d53d7cc9b4 100644 --- a/url/url_canon_icu.cc +++ b/url/url_canon_icu.cc @@ -15,7 +15,7 @@ #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" // for _itoa_s -namespace url_canon { +namespace url { namespace { @@ -227,4 +227,4 @@ bool ReadUTFChar(const base::char16* str, int* begin, int length, return false; } -} // namespace url_canon +} // namespace url |