Roll ICU and convert include style to standard Chromium style,

i.e. third_party/...

BUG=165264

Review URL: https://codereview.chromium.org/11734021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175399 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 30 insertions, 31 deletions

diff --git a/base/android/locale_utils.cc b/base/android/locale_utils.cc
index 60b8f84..49d3441 100644
--- a/base/android/locale_utils.cc
+++ b/base/android/locale_utils.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "jni/LocaleUtils_jni.h"
-#include "unicode/uloc.h"
+#include "third_party/icu/public/common/unicode/uloc.h"
 
 namespace base {
 namespace android {
diff --git a/base/i18n/bidi_line_iterator.h b/base/i18n/bidi_line_iterator.h
index c1dc0ca..048ccb2 100644
--- a/base/i18n/bidi_line_iterator.h
+++ b/base/i18n/bidi_line_iterator.h
@@ -5,11 +5,10 @@
 #ifndef BASE_I18N_BIDI_LINE_ITERATOR_H_
 #define BASE_I18N_BIDI_LINE_ITERATOR_H_
 
-#include "unicode/ubidi.h"
-
 #include "base/basictypes.h"
 #include "base/i18n/base_i18n_export.h"
 #include "base/string16.h"
+#include "third_party/icu/public/common/unicode/ubidi.h"
 
 namespace base {
 namespace i18n {
diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc
index 15451e2..c4ea52c 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 "unicode/ubrk.h"
-#include "unicode/uchar.h"
-#include "unicode/ustring.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"
 
 namespace base {
 namespace i18n {
diff --git a/base/i18n/case_conversion.cc b/base/i18n/case_conversion.cc
index d3b06c9..66edba6 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/string16.h"
-#include "unicode/unistr.h"
+#include "third_party/icu/public/common/unicode/unistr.h"
 
 namespace base {
 namespace i18n {
diff --git a/base/i18n/char_iterator.cc b/base/i18n/char_iterator.cc
index ce4d513..0d5c3de 100644
--- a/base/i18n/char_iterator.cc
+++ b/base/i18n/char_iterator.cc
@@ -4,8 +4,8 @@
 
 #include "base/i18n/char_iterator.h"
 
-#include "unicode/utf8.h"
-#include "unicode/utf16.h"
+#include "third_party/icu/public/common/unicode/utf8.h"
+#include "third_party/icu/public/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 f44af10..c542633 100644
--- a/base/i18n/file_util_icu.cc
+++ b/base/i18n/file_util_icu.cc
@@ -15,8 +15,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
-#include "unicode/coll.h"
-#include "unicode/uniset.h"
+#include "third_party/icu/public/common/unicode/uniset.h"
+#include "third_party/icu/public/i18n/unicode/coll.h"
 
 namespace {
 
diff --git a/base/i18n/icu_encoding_detection.cc b/base/i18n/icu_encoding_detection.cc
index 2081c7a..8914dd7 100644
--- a/base/i18n/icu_encoding_detection.cc
+++ b/base/i18n/icu_encoding_detection.cc
@@ -7,7 +7,7 @@
 #include <set>
 
 #include "base/string_util.h"
-#include "unicode/ucsdet.h"
+#include "third_party/icu/public/i18n/unicode/ucsdet.h"
 
 namespace base {
 
diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc
index 5ebadf3..5e428c3 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/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "unicode/ucnv.h"
-#include "unicode/ucnv_cb.h"
-#include "unicode/ucnv_err.h"
-#include "unicode/unorm.h"
-#include "unicode/ustring.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"
 
 namespace base {
 
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index 43db690..22d64bc 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -18,8 +18,8 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.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"
 
 #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 35ff08d..95eea1b 100644
--- a/base/i18n/number_formatting.cc
+++ b/base/i18n/number_formatting.cc
@@ -11,8 +11,8 @@
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "unicode/numfmt.h"
-#include "unicode/ustring.h"
+#include "third_party/icu/public/common/unicode/ustring.h"
+#include "third_party/icu/public/i18n/unicode/numfmt.h"
 
 namespace base {
 
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index cbbb63f..d9fa019 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -9,10 +9,10 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
-#include "unicode/coll.h"
-#include "unicode/locid.h"
-#include "unicode/uchar.h"
-#include "unicode/uscript.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"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc
index 829b1ab..53ba971 100644
--- a/base/i18n/rtl_unittest.cc
+++ b/base/i18n/rtl_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
-#include "unicode/usearch.h"
+#include "third_party/icu/public/i18n/unicode/usearch.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
diff --git a/base/i18n/string_search.cc b/base/i18n/string_search.cc
index 9dc84cad..f4e53cb 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 "unicode/usearch.h"
+#include "third_party/icu/public/i18n/unicode/usearch.h"
 
 namespace {
 
diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc
index e6ca1c5..8a4aa78 100644
--- a/base/i18n/string_search_unittest.cc
+++ b/base/i18n/string_search_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "unicode/usearch.h"
+#include "third_party/icu/public/i18n/unicode/usearch.h"
 
 namespace base {
 namespace i18n {
diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc
index 9906dba..e60acd1 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/utf_string_conversions.h"
 #include "base/time.h"
-#include "unicode/datefmt.h"
-#include "unicode/dtptngen.h"
-#include "unicode/smpdtfmt.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"
 
 using base::Time;