From 8bbf61998ab30c1cec463611d16ebf83e3050d02 Mon Sep 17 00:00:00 2001 From: "jshin@chromium.org" Date: Thu, 18 Jul 2013 11:14:04 +0000 Subject: [PATCH] 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 --- DEPS | 5 +++-- ash/system/chromeos/power/tray_power.cc | 4 ++-- ash/system/date/date_view.cc | 6 +++--- ash/system/date/tray_date.cc | 6 +++--- base/i18n/bidi_line_iterator.h | 2 +- base/i18n/break_iterator.cc | 6 +++--- base/i18n/case_conversion.cc | 2 +- base/i18n/char_iterator.cc | 4 ++-- base/i18n/file_util_icu.cc | 4 ++-- base/i18n/icu_encoding_detection.cc | 2 +- base/i18n/icu_string_conversions.cc | 10 +++++----- base/i18n/icu_util.cc | 4 ++-- base/i18n/number_formatting.cc | 4 ++-- base/i18n/rtl.cc | 8 ++++---- base/i18n/rtl_unittest.cc | 2 +- base/i18n/string_compare.h | 2 +- base/i18n/string_search.cc | 2 +- base/i18n/string_search_unittest.cc | 2 +- base/i18n/time_formatting.cc | 6 +++--- base/i18n/time_formatting_unittest.cc | 2 +- build/linux/unbundle/icu.gyp | 8 ++++---- chrome/browser/DEPS | 3 ++- chrome/browser/character_encoding.cc | 2 +- chrome/browser/chromeos/cros/cert_library.cc | 2 +- .../input_method/input_method_manager_impl.cc | 2 +- chrome/browser/chromeos/login/wallpaper_manager.h | 2 +- .../login/wizard_controller_browsertest.cc | 2 +- chrome/browser/chromeos/preferences.cc | 2 +- .../chromeos/settings/system_settings_provider.h | 2 +- .../browser/chromeos/system/timezone_settings.cc | 2 +- chrome/browser/chromeos/system/timezone_settings.h | 2 +- chrome/browser/feedback/feedback_util.cc | 2 +- chrome/browser/history/snippet.cc | 6 +++--- chrome/browser/policy/browser_policy_connector.cc | 2 +- chrome/browser/signin/signin_manager.cc | 2 +- chrome/browser/task_manager/task_manager.cc | 2 +- .../translate/translate_infobar_delegate.cc | 2 +- .../ui/app_list/search/term_break_iterator.cc | 2 +- .../search/tokenized_string_char_iterator.cc | 2 +- chrome/browser/ui/omnibox/omnibox_popup_model.cc | 2 +- chrome/browser/ui/prefs/prefs_tab_helper.cc | 4 ++-- .../ui/views/download/download_item_view.cc | 2 +- .../options/chromeos/timezone_options_util.cc | 8 ++++---- .../webui/print_preview/print_preview_handler.cc | 2 +- .../promo_resource_service_unittest.cc | 2 +- chrome/common/extensions/extension_l10n_util.cc | 2 +- chrome/common/spellcheck_common.cc | 2 +- chrome/common/time_format.cc | 10 +++++----- chrome/renderer/pepper/ppb_pdf_impl.cc | 2 +- .../phishing_term_feature_extractor.cc | 2 +- .../spellchecker/spellcheck_worditerator.cc | 8 ++++---- .../spellchecker/spellcheck_worditerator.h | 4 ++-- .../autofill/core/browser/autofill_country.cc | 14 +++++++------- .../autofill/core/browser/autofill_regexes.cc | 2 +- components/autofill/core/browser/credit_card.cc | 4 ++-- content/common/sandbox_mac.mm | 2 +- content/renderer/android/email_detector.cc | 2 +- content/renderer/date_time_formatter.cc | 2 +- content/renderer/date_time_formatter.h | 4 ++-- content/renderer/date_time_formatter_unittest.cc | 2 +- content/renderer/hyphenator/hyphenator.cc | 2 +- .../renderer_main_platform_delegate_win.cc | 2 +- content/zygote/zygote_main_linux.cc | 2 +- ios/public/DEPS | 3 ++- net/base/net_util.cc | 14 +++++++------- net/ftp/ftp_util.cc | 6 +++--- net/http/http_content_disposition.cc | 2 +- ppapi/proxy/browser_font_resource_trusted.cc | 2 +- ppapi/proxy/pdf_resource.cc | 2 +- ppapi/shared_impl/private/ppb_char_set_shared.cc | 8 ++++---- printing/DEPS | 3 ++- printing/backend/print_backend.cc | 2 +- ui/base/l10n/l10n_util.cc | 4 ++-- ui/base/l10n/l10n_util_android.cc | 2 +- ui/base/l10n/l10n_util_collator.h | 2 +- ui/base/l10n/l10n_util_unittest.cc | 2 +- ui/base/models/table_model.h | 2 +- ui/base/text/text_elider.cc | 4 ++-- ui/base/text/text_elider.h | 4 ++-- ui/gfx/render_text.cc | 4 ++-- .../controls/textfield/native_textfield_views.cc | 2 +- url/gurl_test_main.cc | 4 ++-- url/url_canon_icu.cc | 6 +++--- url/url_canon_unittest.cc | 2 +- .../file_system_dir_url_request_job_unittest.cc | 2 +- webkit/common/webpreferences.cc | 2 +- webkit/renderer/webpreferences_renderer.cc | 4 ++-- 87 files changed, 156 insertions(+), 152 deletions(-) diff --git a/DEPS b/DEPS index 4c473f7cc893b4..ff2693c11ff380 100644 --- a/DEPS +++ b/DEPS @@ -77,7 +77,7 @@ deps = { Var("webkit_trunk") + "@" + Var("webkit_revision"), "src/third_party/icu": - "/trunk/deps/third_party/icu46@210659", + "/trunk/deps/third_party/icu46@211851", "src/third_party/libexif/sources": "/trunk/deps/third_party/libexif/sources@146817", @@ -512,7 +512,8 @@ include_rules = [ "+library_loaders", "+testing", - "+third_party/icu/public", + "+third_party/icu/source/common/unicode", + "+third_party/icu/source/i18n/unicode", "+url", # TODO(tfarina): Temporary, until we finish the migration to url. Remove this! "!googleurl", diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index 4fe4e6825f909b..cdf5300032e9d3 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -13,8 +13,8 @@ #include "base/command_line.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "third_party/icu/public/i18n/unicode/fieldpos.h" -#include "third_party/icu/public/i18n/unicode/fmtable.h" +#include "third_party/icu/source/i18n/unicode/fieldpos.h" +#include "third_party/icu/source/i18n/unicode/fmtable.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center.h" diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index 68789fcdd405c0..cc1552d92465ec 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -12,9 +12,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "grit/ash_strings.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/dtptngen.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/dtptngen.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 0e245a81a237f0..8cd22e5579f643 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -21,9 +21,9 @@ #include "base/timer/timer.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/fieldpos.h" -#include "third_party/icu/public/i18n/unicode/fmtable.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/fieldpos.h" +#include "third_party/icu/source/i18n/unicode/fmtable.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/base/i18n/bidi_line_iterator.h b/base/i18n/bidi_line_iterator.h index e632d5e03d9a2a..d5a2a077d7fb4b 100644 --- a/base/i18n/bidi_line_iterator.h +++ b/base/i18n/bidi_line_iterator.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/i18n/base_i18n_export.h" #include "base/strings/string16.h" -#include "third_party/icu/public/common/unicode/ubidi.h" +#include "third_party/icu/source/common/unicode/ubidi.h" namespace base { namespace i18n { diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc index c4ea52cabc52e0..2c4d4669732ac1 100644 --- a/base/i18n/break_iterator.cc +++ b/base/i18n/break_iterator.cc @@ -5,9 +5,9 @@ #include "base/i18n/break_iterator.h" #include "base/logging.h" -#include "third_party/icu/public/common/unicode/ubrk.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/common/unicode/ustring.h" +#include "third_party/icu/source/common/unicode/ubrk.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/ustring.h" namespace base { namespace i18n { diff --git a/base/i18n/case_conversion.cc b/base/i18n/case_conversion.cc index dcd7a55162819c..5debc2ec8d662a 100644 --- a/base/i18n/case_conversion.cc +++ b/base/i18n/case_conversion.cc @@ -5,7 +5,7 @@ #include "base/i18n/case_conversion.h" #include "base/strings/string16.h" -#include "third_party/icu/public/common/unicode/unistr.h" +#include "third_party/icu/source/common/unicode/unistr.h" namespace base { namespace i18n { diff --git a/base/i18n/char_iterator.cc b/base/i18n/char_iterator.cc index 0d5c3de9f1206a..25efc518694c0f 100644 --- a/base/i18n/char_iterator.cc +++ b/base/i18n/char_iterator.cc @@ -4,8 +4,8 @@ #include "base/i18n/char_iterator.h" -#include "third_party/icu/public/common/unicode/utf8.h" -#include "third_party/icu/public/common/unicode/utf16.h" +#include "third_party/icu/source/common/unicode/utf8.h" +#include "third_party/icu/source/common/unicode/utf16.h" namespace base { namespace i18n { diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index ebb7e01ecad69b..4b2ca3ac0b26f4 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -16,8 +16,8 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -#include "third_party/icu/public/common/unicode/uniset.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/common/unicode/uniset.h" +#include "third_party/icu/source/i18n/unicode/coll.h" namespace { diff --git a/base/i18n/icu_encoding_detection.cc b/base/i18n/icu_encoding_detection.cc index 257d83988bf807..ccd5cde2098dbc 100644 --- a/base/i18n/icu_encoding_detection.cc +++ b/base/i18n/icu_encoding_detection.cc @@ -7,7 +7,7 @@ #include #include "base/strings/string_util.h" -#include "third_party/icu/public/i18n/unicode/ucsdet.h" +#include "third_party/icu/source/i18n/unicode/ucsdet.h" namespace base { diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc index 1517399cdafcc4..1530117f1e4a9d 100644 --- a/base/i18n/icu_string_conversions.cc +++ b/base/i18n/icu_string_conversions.cc @@ -11,11 +11,11 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.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/ucnv_err.h" -#include "third_party/icu/public/common/unicode/unorm.h" -#include "third_party/icu/public/common/unicode/ustring.h" +#include "third_party/icu/source/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv_cb.h" +#include "third_party/icu/source/common/unicode/ucnv_err.h" +#include "third_party/icu/source/common/unicode/unorm.h" +#include "third_party/icu/source/common/unicode/ustring.h" namespace base { diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index d6feb1e890ca8f..76016d0ce69a2f 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -18,8 +18,8 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "third_party/icu/public/common/unicode/putil.h" -#include "third_party/icu/public/common/unicode/udata.h" +#include "third_party/icu/source/common/unicode/putil.h" +#include "third_party/icu/source/common/unicode/udata.h" #if defined(OS_MACOSX) #include "base/mac/foundation_util.h" diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index 11044d847be0f4..47aa14cab23bc7 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -11,8 +11,8 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/icu/public/common/unicode/ustring.h" -#include "third_party/icu/public/i18n/unicode/numfmt.h" +#include "third_party/icu/source/common/unicode/ustring.h" +#include "third_party/icu/source/i18n/unicode/numfmt.h" namespace base { diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc index 92b54333206a20..d9818e800e2559 100644 --- a/base/i18n/rtl.cc +++ b/base/i18n/rtl.cc @@ -9,10 +9,10 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/icu/public/common/unicode/locid.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/common/unicode/uscript.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/common/unicode/locid.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uscript.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #if defined(TOOLKIT_GTK) #include diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc index e9478475450642..58772b05839bd4 100644 --- a/base/i18n/rtl_unittest.cc +++ b/base/i18n/rtl_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" #if defined(TOOLKIT_GTK) #include diff --git a/base/i18n/string_compare.h b/base/i18n/string_compare.h index 307ffdb12bf9a8..f0f3e297f09c63 100644 --- a/base/i18n/string_compare.h +++ b/base/i18n/string_compare.h @@ -11,7 +11,7 @@ #include "base/i18n/base_i18n_export.h" #include "base/strings/string16.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" namespace base { namespace i18n { diff --git a/base/i18n/string_search.cc b/base/i18n/string_search.cc index 17304b31cc7081..121dfce58699e5 100644 --- a/base/i18n/string_search.cc +++ b/base/i18n/string_search.cc @@ -5,7 +5,7 @@ #include "base/i18n/string_search.h" #include "base/logging.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" namespace base { namespace i18n { diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc index d2bd53a6d130a0..9419b267cb584c 100644 --- a/base/i18n/string_search_unittest.cc +++ b/base/i18n/string_search_unittest.cc @@ -9,7 +9,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" namespace base { namespace i18n { diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc index ca94ead49adfcb..3973dd2508f14c 100644 --- a/base/i18n/time_formatting.cc +++ b/base/i18n/time_formatting.cc @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/dtptngen.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/dtptngen.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" using base::Time; diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc index b6992eb731b55d..03a3aa3ec77f95 100644 --- a/base/i18n/time_formatting_unittest.cc +++ b/base/i18n/time_formatting_unittest.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/uversion.h" +#include "third_party/icu/source/common/unicode/uversion.h" namespace base { namespace { diff --git a/build/linux/unbundle/icu.gyp b/build/linux/unbundle/icu.gyp index 2016ccbabb6007..566df654fab42b 100644 --- a/build/linux/unbundle/icu.gyp +++ b/build/linux/unbundle/icu.gyp @@ -36,9 +36,9 @@ 'headers_root_path': 'public/i18n', 'header_filenames': [ # This list can easily be updated using the command below: - # find third_party/icu/public/i18n -iname '*.h' \ + # find third_party/icu/source/i18n/unicode -iname '*.h' \ # -printf "'%p',\n" | \ - # sed -e 's|third_party/icu/public/i18n/||' | sort -u + # sed -e 's|third_party/icu/source/i18n/||' | sort -u 'unicode/basictz.h', 'unicode/bmsearch.h', 'unicode/bms.h', @@ -122,9 +122,9 @@ 'headers_root_path': 'public/common', 'header_filenames': [ # This list can easily be updated using the command below: - # find third_party/icu/public/common -iname '*.h' \ + # find third_party/icu/source/common/unicode -iname '*.h' \ # -printf "'%p',\n" | \ - # sed -e 's|third_party/icu/public/common/||' | sort -u + # sed -e 's|third_party/icu/source/common/||' | sort -u 'unicode/brkiter.h', 'unicode/bytestream.h', 'unicode/caniter.h', diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 8a76397d433b3e..3057062332a91e 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -77,7 +77,8 @@ include_rules = [ "+third_party/cld", "+third_party/expat", "+third_party/iaccessible2", - "+third_party/icu", + "+third_party/icu/source/common/unicode", + "+third_party/icu/source/i18n/unicode", "+third_party/isimpledom", "+third_party/leveldatabase", "+third_party/libevent", # For the remote V8 debugging server diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 9a0f1122f5927a..4909a7b8edd8a1 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -15,7 +15,7 @@ #include "chrome/app/chrome_command_ids.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" -#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 952f14f1358b1f..315c594a281596 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -25,7 +25,7 @@ #include "grit/generated_resources.h" #include "net/cert/cert_database.h" #include "net/cert/nss_cert_database.h" -#include "third_party/icu/public/i18n/unicode/coll.h" // icu::Collator +#include "third_party/icu/source/i18n/unicode/coll.h" // icu::Collator #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index 4f21a46c149822..fcb891952dea92 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -23,7 +23,7 @@ #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/input_method_delegate.h" #include "chromeos/ime/xkeyboard.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/accelerators/accelerator.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h index 62e00d7cddac1a..c994abac908f20 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/wallpaper_manager.h @@ -21,7 +21,7 @@ #include "chromeos/dbus/power_manager_client.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/gfx/image/image_skia.h" class PrefRegistrySimple; diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index aab384de4ea7bd..60aff4bb946f32 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -33,7 +33,7 @@ #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/source/common/unicode/locid.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 5248353c51fab7..392581833c2f2f 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -33,7 +33,7 @@ #include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "components/user_prefs/pref_registry_syncable.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/base/events/event_constants.h" #include "ui/base/events/event_utils.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h index ef7c174b69c23f..0b993b1abb6f58 100644 --- a/chrome/browser/chromeos/settings/system_settings_provider.h +++ b/chrome/browser/chromeos/settings/system_settings_provider.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/settings/cros_settings_provider.h" #include "chrome/browser/chromeos/system/timezone_settings.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" namespace base { class StringValue; diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index 6ebffc9735259e..eab34e9f9c1b2e 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -21,7 +21,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/system/timezone_settings.h b/chrome/browser/chromeos/system/timezone_settings.h index 6e9cc6cad4aa32..ca62bf9d0e9629 100644 --- a/chrome/browser/chromeos/system/timezone_settings.h +++ b/chrome/browser/chromeos/system/timezone_settings.h @@ -8,7 +8,7 @@ #include #include "base/strings/string16.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" namespace chromeos { namespace system { diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc index 873f12c5c65119..8095fad40a3018 100644 --- a/chrome/browser/feedback/feedback_util.cc +++ b/chrome/browser/feedback/feedback_util.cc @@ -37,7 +37,7 @@ #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" -#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/source/common/unicode/locid.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index 90d80d0e45843f..e1069a6cde912a 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -11,9 +11,9 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/icu/public/common/unicode/brkiter.h" -#include "third_party/icu/public/common/unicode/utext.h" -#include "third_party/icu/public/common/unicode/utf8.h" +#include "third_party/icu/source/common/unicode/brkiter.h" +#include "third_party/icu/source/common/unicode/utext.h" +#include "third_party/icu/source/common/unicode/utf8.h" namespace { diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 718e572009e31b..2a1d1cf7decc51 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -37,7 +37,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request_context_getter.h" #include "policy/policy_constants.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" #if defined(OS_WIN) #include "chrome/browser/policy/policy_loader_win.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index d0629e57060e5d..f419d84cfd5334 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -38,7 +38,7 @@ #include "google_apis/gaia/gaia_urls.h" #include "net/base/escape.h" #include "net/url_request/url_request_context.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" using namespace signin_internals_util; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index be9a3b9f7660a2..8c5bae683a4134 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -41,7 +41,7 @@ #include "content/public/common/result_codes.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc index 20a5b0a7d4bc0f..bc38dcf050959a 100644 --- a/chrome/browser/translate/translate_infobar_delegate.cc +++ b/chrome/browser/translate/translate_infobar_delegate.cc @@ -20,7 +20,7 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" using content::NavigationEntry; diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.cc b/chrome/browser/ui/app_list/search/term_break_iterator.cc index 071a5527c767a8..1349683c8e5bab 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.cc +++ b/chrome/browser/ui/app_list/search/term_break_iterator.cc @@ -7,7 +7,7 @@ #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc index 5a122b64045407..6999edde79acc2 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc +++ b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc @@ -6,7 +6,7 @@ #include "base/i18n/char_iterator.h" #include "base/logging.h" -#include "third_party/icu/public/common/unicode/utf16.h" +#include "third_party/icu/source/common/unicode/utf16.h" namespace app_list { diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index 30d182594917a0..014c7f8896dada 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -16,7 +16,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" -#include "third_party/icu/public/common/unicode/ubidi.h" +#include "third_party/icu/source/common/unicode/ubidi.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 30feabbf9acca4..3e3f7186b80921 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -25,8 +25,8 @@ #include "content/public/browser/web_contents.h" #include "grit/locale_settings.h" #include "grit/platform_locale_settings.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uscript.h" #include "webkit/common/webpreferences.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 4977edf2adc9ec..0bdc6c4ebe9393 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -30,7 +30,7 @@ #include "content/public/browser/download_danger_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/events/event.h" diff --git a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc index c6cd40b46c881d..4d09319a9bc999 100644 --- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc +++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc @@ -15,10 +15,10 @@ #include "base/values.h" #include "chrome/browser/chromeos/system/timezone_settings.h" #include "grit/generated_resources.h" -#include "third_party/icu/public/common/unicode/ures.h" -#include "third_party/icu/public/common/unicode/utypes.h" -#include "third_party/icu/public/i18n/unicode/calendar.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/common/unicode/ures.h" +#include "third_party/icu/source/common/unicode/utypes.h" +#include "third_party/icu/source/i18n/unicode/calendar.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 98b218805dd315..b22c90e51843e6 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -62,7 +62,7 @@ #include "printing/page_range.h" #include "printing/page_size_margins.h" #include "printing/print_settings.h" -#include "third_party/icu/public/i18n/unicode/ulocdata.h" +#include "third_party/icu/source/i18n/unicode/ulocdata.h" #if defined(OS_CHROMEOS) // TODO(kinaba): provide more non-intrusive way for handling local/remote diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 95e2a773d521ce..0f0ae62ab6711d 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -27,7 +27,7 @@ #include "content/public/browser/notification_service.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" namespace { diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index ac4b4baa75fed2..807deae95d9b60 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -21,7 +21,7 @@ #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc index 601a38e05b2b92..8eaf59140a2742 100644 --- a/chrome/common/spellcheck_common.cc +++ b/chrome/common/spellcheck_common.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/logging.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" namespace chrome { namespace spellcheck_common { diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index adc246a90bcc38..8e19e66809dc4c 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -15,11 +15,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "grit/generated_resources.h" -#include "third_party/icu/public/common/unicode/locid.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/plurfmt.h" -#include "third_party/icu/public/i18n/unicode/plurrule.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/common/unicode/locid.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/plurfmt.h" +#include "third_party/icu/source/i18n/unicode/plurrule.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" using base::Time; diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc index 7b4a1d42a87daa..9ccba218269b6d 100644 --- a/chrome/renderer/pepper/ppb_pdf_impl.cc +++ b/chrome/renderer/pepper/ppb_pdf_impl.cc @@ -29,7 +29,7 @@ #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebPluginContainer.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index 66613b7b863cbd..c848cd32b0af61 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -19,7 +19,7 @@ #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/murmurhash3_util.h" #include "crypto/sha2.h" -#include "third_party/icu/public/common/unicode/ubrk.h" +#include "third_party/icu/source/common/unicode/ubrk.h" #include "ui/base/l10n/l10n_util.h" namespace safe_browsing { diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 29d77c79465de6..c024bcd54a3ad1 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -14,10 +14,10 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/renderer/spellchecker/spellcheck.h" -#include "third_party/icu/public/common/unicode/normlzr.h" -#include "third_party/icu/public/common/unicode/schriter.h" -#include "third_party/icu/public/common/unicode/uscript.h" -#include "third_party/icu/public/i18n/unicode/ulocdata.h" +#include "third_party/icu/source/common/unicode/normlzr.h" +#include "third_party/icu/source/common/unicode/schriter.h" +#include "third_party/icu/source/common/unicode/uscript.h" +#include "third_party/icu/source/i18n/unicode/ulocdata.h" // SpellcheckCharAttribute implementation: diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chrome/renderer/spellchecker/spellcheck_worditerator.h index b5f6f2c78e90c8..210c6bbe9c82cf 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.h +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.h @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "third_party/icu/public/common/unicode/ubrk.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/ubrk.h" +#include "third_party/icu/source/common/unicode/uscript.h" // A class which encapsulates language-specific operations used by // SpellcheckWordIterator. When we set the spellchecker language, this class diff --git a/components/autofill/core/browser/autofill_country.cc b/components/autofill/core/browser/autofill_country.cc index 1bbe5541e4c3d3..45c89c7b711ec1 100644 --- a/components/autofill/core/browser/autofill_country.cc +++ b/components/autofill/core/browser/autofill_country.cc @@ -16,13 +16,13 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "grit/component_strings.h" -#include "third_party/icu/public/common/unicode/locid.h" -#include "third_party/icu/public/common/unicode/uloc.h" -#include "third_party/icu/public/common/unicode/unistr.h" -#include "third_party/icu/public/common/unicode/urename.h" -#include "third_party/icu/public/common/unicode/utypes.h" -#include "third_party/icu/public/i18n/unicode/coll.h" -#include "third_party/icu/public/i18n/unicode/ucol.h" +#include "third_party/icu/source/common/unicode/locid.h" +#include "third_party/icu/source/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/unistr.h" +#include "third_party/icu/source/common/unicode/urename.h" +#include "third_party/icu/source/common/unicode/utypes.h" +#include "third_party/icu/source/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/ucol.h" #include "ui/base/l10n/l10n_util.h" namespace autofill { diff --git a/components/autofill/core/browser/autofill_regexes.cc b/components/autofill/core/browser/autofill_regexes.cc index 1258cef8a75149..c8b2ba487a8458 100644 --- a/components/autofill/core/browser/autofill_regexes.cc +++ b/components/autofill/core/browser/autofill_regexes.cc @@ -12,7 +12,7 @@ #include "base/memory/singleton.h" #include "base/stl_util.h" #include "base/strings/string16.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" namespace { diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc index 5907cfdfef7c4e..31933a0e1ae7a4 100644 --- a/components/autofill/core/browser/credit_card.cc +++ b/components/autofill/core/browser/credit_card.cc @@ -26,8 +26,8 @@ #include "components/autofill/core/common/form_field_data.h" #include "grit/component_strings.h" #include "grit/webkit_resources.h" -#include "third_party/icu/public/common/unicode/uloc.h" -#include "third_party/icu/public/i18n/unicode/dtfmtsym.h" +#include "third_party/icu/source/common/unicode/uloc.h" +#include "third_party/icu/source/i18n/unicode/dtfmtsym.h" #include "ui/base/l10n/l10n_util.h" namespace autofill { diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index b58c332b806ddf..d531f8bfef410a 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -32,7 +32,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "grit/content_resources.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" #include "ui/base/layout.h" #include "ui/gl/gl_surface.h" diff --git a/content/renderer/android/email_detector.cc b/content/renderer/android/email_detector.cc index 76c683819ed2e6..28b8af4d90103d 100644 --- a/content/renderer/android/email_detector.cc +++ b/content/renderer/android/email_detector.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/android_content_detection_prefixes.h" #include "net/base/escape.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" namespace { diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc index f9d02edff84501..7cdc4bdcada9d0 100644 --- a/content/renderer/date_time_formatter.cc +++ b/content/renderer/date_time_formatter.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" namespace content { diff --git a/content/renderer/date_time_formatter.h b/content/renderer/date_time_formatter.h index c01a2b14ad7411..ad4c020d4fe429 100644 --- a/content/renderer/date_time_formatter.h +++ b/content/renderer/date_time_formatter.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "third_party/icu/public/common/unicode/unistr.h" -#include "third_party/icu/public/i18n/unicode/gregocal.h" +#include "third_party/icu/source/common/unicode/unistr.h" +#include "third_party/icu/source/i18n/unicode/gregocal.h" #include "ui/base/ime/text_input_type.h" namespace WebKit { diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc index b5afc1c62fca03..5b61b71ae0a834 100644 --- a/content/renderer/date_time_formatter_unittest.cc +++ b/content/renderer/date_time_formatter_unittest.cc @@ -8,7 +8,7 @@ #include "content/renderer/renderer_date_time_picker.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" -#include "third_party/icu/public/common/unicode/unistr.h" +#include "third_party/icu/source/common/unicode/unistr.h" #include "ui/base/ime/text_input_type.h" namespace content { diff --git a/content/renderer/hyphenator/hyphenator.cc b/content/renderer/hyphenator/hyphenator.cc index f638c07b053280..b94ba3cc6981a6 100644 --- a/content/renderer/hyphenator/hyphenator.cc +++ b/content/renderer/hyphenator/hyphenator.cc @@ -12,7 +12,7 @@ #include "content/common/hyphenator_messages.h" #include "content/public/renderer/render_thread.h" #include "third_party/hyphen/hyphen.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/uscript.h" namespace { diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index 49c3589ac9e56f..44d5166f6ffbb5 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -15,7 +15,7 @@ #include "content/renderer/render_thread_impl.h" #include "sandbox/win/src/sandbox.h" #include "skia/ext/vector_platform_device_emf_win.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/skia/include/ports/SkTypeface_win.h" #ifdef ENABLE_VTUNE_JIT_INTERFACE diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 457a4a1b0908b1..dcea4c05852149 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -39,7 +39,7 @@ #include "crypto/nss_util.h" #include "sandbox/linux/services/libc_urandom_override.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/skia/include/ports/SkFontConfigInterface.h" #if defined(OS_LINUX) diff --git a/ios/public/DEPS b/ios/public/DEPS index 2da55c42f3a6b3..3f0cd59cfce9f7 100644 --- a/ios/public/DEPS +++ b/ios/public/DEPS @@ -7,6 +7,7 @@ include_rules = [ "-googleurl", "-library_loaders", "-testing", - "-third_party/icu/public", + "-third_party/icu/source/common/unicode", + "-third_party/icu/source/i18n/unicode", "-url", ] diff --git a/net/base/net_util.cc b/net/base/net_util.cc index db9251b21b1c06..50766ddcea62d5 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -68,13 +68,13 @@ #include "net/base/winsock_init.h" #endif #include "net/http/http_content_disposition.h" -#include "third_party/icu/public/common/unicode/uidna.h" -#include "third_party/icu/public/common/unicode/uniset.h" -#include "third_party/icu/public/common/unicode/uscript.h" -#include "third_party/icu/public/common/unicode/uset.h" -#include "third_party/icu/public/i18n/unicode/datefmt.h" -#include "third_party/icu/public/i18n/unicode/regex.h" -#include "third_party/icu/public/i18n/unicode/ulocdata.h" +#include "third_party/icu/source/common/unicode/uidna.h" +#include "third_party/icu/source/common/unicode/uniset.h" +#include "third_party/icu/source/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/uset.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/ulocdata.h" using base::Time; diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc index 86c72bb2a877ab..c5e18c8f79d7de 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; diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc index 758b1761ef4f3c..3dbf234b9435a5 100644 --- a/net/http/http_content_disposition.cc +++ b/net/http/http_content_disposition.cc @@ -13,7 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" -#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv.h" namespace { diff --git a/ppapi/proxy/browser_font_resource_trusted.cc b/ppapi/proxy/browser_font_resource_trusted.cc index 33b858e8475440..b8bc8759d4d721 100644 --- a/ppapi/proxy/browser_font_resource_trusted.cc +++ b/ppapi/proxy/browser_font_resource_trusted.cc @@ -20,7 +20,7 @@ #include "third_party/WebKit/public/web/WebFont.h" #include "third_party/WebKit/public/web/WebFontDescription.h" #include "third_party/WebKit/public/web/WebTextRun.h" -#include "third_party/icu/public/common/unicode/ubidi.h" +#include "third_party/icu/source/common/unicode/ubidi.h" #include "third_party/skia/include/core/SkRect.h" using ppapi::StringVar; diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc index 122b88c662c2d3..8e0a2e0bbf19aa 100644 --- a/ppapi/proxy/pdf_resource.cc +++ b/ppapi/proxy/pdf_resource.cc @@ -14,7 +14,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/ppb_image_data_proxy.h" #include "ppapi/shared_impl/var.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" namespace ppapi { namespace proxy { diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.cc b/ppapi/shared_impl/private/ppb_char_set_shared.cc index 5ce51a6c8f8096..2fda8aac556379 100644 --- a/ppapi/shared_impl/private/ppb_char_set_shared.cc +++ b/ppapi/shared_impl/private/ppb_char_set_shared.cc @@ -9,10 +9,10 @@ #include "base/i18n/icu_string_conversions.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/thunk/thunk.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/ucnv_err.h" -#include "third_party/icu/public/common/unicode/ustring.h" +#include "third_party/icu/source/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv_cb.h" +#include "third_party/icu/source/common/unicode/ucnv_err.h" +#include "third_party/icu/source/common/unicode/ustring.h" namespace ppapi { diff --git a/printing/DEPS b/printing/DEPS index 9b4c48e695dc6b..9c706cd6ef0b8e 100644 --- a/printing/DEPS +++ b/printing/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+skia/ext", - "+third_party/icu", + "+third_party/icu/source/common/unicode", + "+third_party/icu/source/i18n/unicode", "+third_party/skia", "+ui/aura", "+ui/base/text", diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc index 74c21a52d0a9b8..958343f4ac8d63 100644 --- a/printing/backend/print_backend.cc +++ b/printing/backend/print_backend.cc @@ -6,7 +6,7 @@ #include -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 995a277f9eaa09..513a615a14166e 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -25,8 +25,8 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -#include "third_party/icu/public/common/unicode/rbbi.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/rbbi.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/ui/base/l10n/l10n_util_android.cc b/ui/base/l10n/l10n_util_android.cc index 56bb08b0b4be99..d482b53c2437c6 100644 --- a/ui/base/l10n/l10n_util_android.cc +++ b/ui/base/l10n/l10n_util_android.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "jni/LocalizationUtils_jni.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" namespace l10n_util { diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index 44e4a77c99c205..b91b804fc32dd3 100644 --- a/ui/base/l10n/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -12,7 +12,7 @@ #include "base/i18n/string_compare.h" #include "base/memory/scoped_ptr.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/ui_export.h" namespace l10n_util { diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 78b55fbb025bad..3f17fa2401e6b9 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -20,7 +20,7 @@ #include "base/test/scoped_path_override.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/source/common/unicode/locid.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/ui_base_paths.h" diff --git a/ui/base/models/table_model.h b/ui/base/models/table_model.h index 92cf586738fac8..5792bfee1447a9 100644 --- a/ui/base/models/table_model.h +++ b/ui/base/models/table_model.h @@ -8,7 +8,7 @@ #include #include "base/strings/string16.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/ui_export.h" namespace gfx { diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index 557607bb429904..05909816cf35c3 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -24,8 +24,8 @@ #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/icu/public/common/unicode/rbbi.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/rbbi.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/gfx/font.h" #include "url/gurl.h" diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h index 62b4d0cf079dc0..1d31f8eea637c9 100644 --- a/ui/base/text/text_elider.h +++ b/ui/base/text/text_elider.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/ui_export.h" #include "ui/gfx/font.h" diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index d3c6bea6ffe682..1f760cc99dd69d 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -9,8 +9,8 @@ #include "base/i18n/break_iterator.h" #include "base/logging.h" #include "base/stl_util.h" -#include "third_party/icu/public/common/unicode/rbbi.h" -#include "third_party/icu/public/common/unicode/utf16.h" +#include "third_party/icu/source/common/unicode/rbbi.h" +#include "third_party/icu/source/common/unicode/utf16.h" #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/text/text_elider.h" diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index c10fb17851b60b..a48ff4f3c0d8a8 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -15,7 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "grit/app_locale_settings.h" #include "grit/ui_strings.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/dragdrop/drag_drop_types.h" diff --git a/url/gurl_test_main.cc b/url/gurl_test_main.cc index 83155fdd634b33..d35e5d4df60106 100644 --- a/url/gurl_test_main.cc +++ b/url/gurl_test_main.cc @@ -11,8 +11,8 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/putil.h" -#include "third_party/icu/public/common/unicode/udata.h" +#include "third_party/icu/source/common/unicode/putil.h" +#include "third_party/icu/source/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 95e9c1384e1e07..8d6bdfc12ada66 100644 --- a/url/url_canon_icu.cc +++ b/url/url_canon_icu.cc @@ -8,9 +8,9 @@ #include #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 "third_party/icu/source/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv_cb.h" +#include "third_party/icu/source/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 6f52d669adefd3..b3c129d85b653d 100644 --- a/url/url_canon_unittest.cc +++ b/url/url_canon_unittest.cc @@ -5,7 +5,7 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv.h" #include "url/url_canon.h" #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc index 541ddd50cb7c63..1c197cd294d312 100644 --- a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -21,7 +21,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_file_util.h" #include "webkit/browser/fileapi/file_system_operation_context.h" diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index 120aea7ad1c5f0..9ae6118b0abefa 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -8,7 +8,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/web/WebSettings.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" using WebKit::WebSettings; diff --git a/webkit/renderer/webpreferences_renderer.cc b/webkit/renderer/webpreferences_renderer.cc index 2102a881c5911e..c7c2f5b580db57 100644 --- a/webkit/renderer/webpreferences_renderer.cc +++ b/webkit/renderer/webpreferences_renderer.cc @@ -12,8 +12,8 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uscript.h" #include "webkit/common/webpreferences.h" using WebKit::WebNetworkStateNotifier;