diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 15:39:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 15:39:57 +0000 |
| commit | b530c397e36547916b9342298bbd8516676d36f2 (patch) | |
| tree | 5cdf3d7f476c1747b86a544671507239f8f79f55 | |
| parent | 63b53ad3450930ae1b63e78f45a43d21f47583d1 (diff) | |
| download | chromium_src-b530c397e36547916b9342298bbd8516676d36f2.zip chromium_src-b530c397e36547916b9342298bbd8516676d36f2.tar.gz chromium_src-b530c397e36547916b9342298bbd8516676d36f2.tar.bz2 | |
url: Fix the include paths to icu unicode APIs.
BUG=229660
TEST=url_unittests
R=brettw@chromium.org
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14371002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | url/DEPS | 4 | ||||
| -rw-r--r-- | url/gurl_test_main.cc | 4 | ||||
| -rw-r--r-- | url/url_canon_icu.cc | 6 | ||||
| -rw-r--r-- | url/url_canon_unittest.cc | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/url/DEPS b/url/DEPS deleted file mode 100644 index df1074f..0000000 --- a/url/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - # TODO(brettw) erase these, just temporary until this code is done. - "+unicode", -] diff --git a/url/gurl_test_main.cc b/url/gurl_test_main.cc index 43f19df..35c9349 100644 --- a/url/gurl_test_main.cc +++ b/url/gurl_test_main.cc @@ -36,8 +36,8 @@ #include <string> #include "testing/gtest/include/gtest/gtest.h" -#include "unicode/putil.h" -#include "unicode/udata.h" +#include "third_party/icu/public/common/unicode/putil.h" +#include "third_party/icu/public/common/unicode/udata.h" #define ICU_UTIL_DATA_SHARED 1 #define ICU_UTIL_DATA_STATIC 2 diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc index 028b995..9253628 100644 --- a/url/url_canon_icu.cc +++ b/url/url_canon_icu.cc @@ -31,11 +31,11 @@ #include <stdlib.h> #include <string.h> -#include <unicode/ucnv.h> -#include <unicode/ucnv_cb.h> -#include <unicode/uidna.h> #include "base/logging.h" +#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/public/common/unicode/ucnv_cb.h" +#include "third_party/icu/public/common/unicode/uidna.h" #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" // for _itoa_s diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc index 55b349f..0664b66 100644 --- a/url/url_canon_unittest.cc +++ b/url/url_canon_unittest.cc @@ -28,9 +28,9 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <errno.h> -#include <unicode/ucnv.h> #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/icu/public/common/unicode/ucnv.h" #include "url/url_canon.h" #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" |