Replace third_party/icu/public with third_party/icu/source in the inc…

…lude 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
cbchan · Jul 18, 2013 · 8bbf619 · 8bbf619
1 parent 5c8f89f
commit 8bbf619
Show file tree

Hide file tree

Showing 87 changed files with 156 additions and 152 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 #include <set>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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 <gtk/gtk.h>

diff --git 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 <gtk/gtk.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,7 @@
 #include <vector>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"