diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
| commit | 8bbf61998ab30c1cec463611d16ebf83e3050d02 (patch) | |
| tree | 114a07f1e9a38ccdf4800d18c18a9bd35122c5e3 /net/ftp | |
| parent | 5c8f89f69d54d7bafdf1910d620459e0a788c781 (diff) | |
| download | chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.zip chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.gz chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.bz2 | |
Replace third_party/icu/public with third_party/icu/source in the include directives.
This is to move back icu headers in
third_party/icu/public/{i18n,common}/unicode back to their upstream
locations in third_party/icu/source/{i18n,common}/unicode.
http://codereview.chromium.org/18836004 has is a CL to move
ICU header files.
Roll ICU to the version with the above ICU CL (http://crrev.com/211851 ).
In addition to the global replacement of third_party/icu/public with third_party/icu/source, the top-level DEPS, DEPS in printing and chrome/ are tightened up. (the latter two were too permissive (it used to allow any header from third_party/icu).
Besides, sync '-foo' list in ios/public/DEPS with '+foo' in the top-level DEPS and build/linux/unbundled/icu.gyp is updated.
BUG=251433
TEST=Compile succeeds on all bots. checkdeps.py does not find any error.
TBR=brettw,sky,wtc
Review URL: https://chromiumcodereview.appspot.com/18252003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
| -rw-r--r-- | net/ftp/ftp_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc index 86c72bb..c5e18c8 100644 --- a/net/ftp/ftp_util.cc +++ b/net/ftp/ftp_util.cc @@ -18,9 +18,9 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/dtfmtsym.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/dtfmtsym.h" using base::StringPiece16; |