Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc

In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a). 

Also updated is the test results for net_util_unittests.


This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there). 

BUG=8198
TEST=On all platforms, all the targets are built fine.

Review URL: http://codereview.chromium.org/172031

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

32 files changed, 105 insertions, 90 deletions

diff --git a/.gitignore b/.gitignore
index acf6893..67029f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@
 /third_party/ffmpeg/binaries/
 /third_party/googlemac/
 /third_party/hunspell/
-/third_party/icu38/
+/third_party/icu/
 /third_party/personalization/
 /third_party/pdfsqueeze/
 /third_party/protobuf2/
diff --git a/DEPS b/DEPS
index 915ad2f..3c42a1c 100644
--- a/DEPS
+++ b/DEPS
@@ -24,11 +24,11 @@ deps = {
   "src/third_party/WebKit":
     "/trunk/deps/third_party/WebKit@20601",
 
-  "src/third_party/icu38":
-    "/trunk/deps/third_party/icu38@24923",
+  "src/third_party/icu":
+    "/trunk/deps/third_party/icu42@25651",
 
   "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell128@24986",
+   "/trunk/deps/third_party/hunspell128@25668",
 
   "src/third_party/protobuf2/src":
     "http://protobuf.googlecode.com/svn/trunk@219",
diff --git a/app/app.gyp b/app/app.gyp
index 71a72d0..f01073c 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -48,8 +48,8 @@
         '../base/base.gyp:base_gfx',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'include_dirs': [
         '..',
@@ -185,8 +185,8 @@
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'sources': [
diff --git a/base/base.gyp b/base/base.gyp
index a495d49..f6a7192 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -14,8 +14,8 @@
       'target_name': 'base',
       'type': '<(library)',
       'dependencies': [
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
       'sources': [
@@ -667,7 +667,7 @@
       'include_dirs': [
         # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
         # #include for unicode/uchar.h.  This should probably be cleaned up.
-        '../third_party/icu38/public/common',
+        '../third_party/icu/public/common',
       ],
       'dependencies': [
         'base',
@@ -703,7 +703,7 @@
         # TODO(mark): This should not be necessary.
         ['OS == "win"', {
           'dependencies': [
-            '../third_party/icu38/icu38.gyp:icudata',
+            '../third_party/icu/icu.gyp:icudata',
           ],
           'sources!': [
             'data_pack_unittest.cc',
diff --git a/base/icu_util.cc b/base/icu_util.cc
index 0f42395..b885cd1 100644
--- a/base/icu_util.cc
+++ b/base/icu_util.cc
@@ -62,12 +62,17 @@ bool Initialize() {
                           ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));
 
   HMODULE module = LoadLibrary(data_path.c_str());
-  if (!module)
+  if (!module) {
+    LOG(ERROR) << "Failed to load " << ICU_UTIL_DATA_SHARED_MODULE_NAME;
     return false;
+  }
 
   FARPROC addr = GetProcAddress(module, ICU_UTIL_DATA_SYMBOL);
-  if (!addr)
+  if (!addr) {
+    LOG(ERROR) << ICU_UTIL_DATA_SYMBOL << ": not found in "
+               << ICU_UTIL_DATA_SHARED_MODULE_NAME;
     return false;
+  }
 
   UErrorCode err = U_ZERO_ERROR;
   udata_setCommonData(reinterpret_cast<void*>(addr), &err);
diff --git a/build/all.gyp b/build/all.gyp
index d5db99a..812e72b 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -26,7 +26,7 @@
         '../third_party/bzip2/bzip2.gyp:*',
         '../third_party/codesighs/codesighs.gyp:*',
         '../third_party/ffmpeg/ffmpeg.gyp:*',
-        '../third_party/icu38/icu38.gyp:*',
+        '../third_party/icu/icu.gyp:*',
         '../third_party/libjpeg/libjpeg.gyp:*',
         '../third_party/libpng/libpng.gyp:*',
         '../third_party/libxml/libxml.gyp:*',
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 4f0dac0..4fbab83 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -17,9 +17,9 @@
       'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
       'dependencies': [
         '../../base/base.gyp:base',
-        '../../third_party/icu38/icu38.gyp:icudata',
-        '../../third_party/icu38/icu38.gyp:icui18n',
-        '../../third_party/icu38/icu38.gyp:icuuc',
+        '../../third_party/icu/icu.gyp:icudata',
+        '../../third_party/icu/icu.gyp:icui18n',
+        '../../third_party/icu/icu.gyp:icuuc',
       ],
       'sources': [
         '../../googleurl/src/gurl.cc',
@@ -62,7 +62,7 @@
       'dependencies': [
         'googleurl',
         '../../testing/gtest.gyp:gtest',
-        '../../third_party/icu38/icu38.gyp:icuuc',
+        '../../third_party/icu/icu.gyp:icuuc',
       ],
       'sources': [
         '../../googleurl/src/gurl_unittest.cc',
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index 57d101ae..bce6ce9 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/notification_service.h"
-#include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "third_party/icu/public/common/unicode/ubidi.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupModel
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index bd61783..346edc9 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -306,15 +306,15 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION</strong>
 </div>
 </div>
 
-<!-- ICU38 --->
+<!-- ICU --->
 <div class="product">
-<span class="title">icu38</span>
+<span class="title">ICU</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://www.icu-project.org">homepage</a></span>
 <div class="licence">
-<h3>icu38 is licensed as follows:</h3>
+<h3>third_party/icu is licensed as follows:</h3>
 <p>COPYRIGHT AND PERMISSION NOTICE</p>
-<p>Copyright (c) 1995-2008 International Business Machines Corporation and others</p>
+<p>Copyright (c) 1995-2009 International Business Machines Corporation and others</p>
 <p>All rights reserved.</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.</p>
 <p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>
diff --git a/chrome/browser/spellcheck_worditerator.cc b/chrome/browser/spellcheck_worditerator.cc
index dde4752..87343e5 100644
--- a/chrome/browser/spellcheck_worditerator.cc
+++ b/chrome/browser/spellcheck_worditerator.cc
@@ -11,12 +11,12 @@
 #include "base/string_util.h"
 #include "chrome/browser/spellchecker.h"
 
-#include "third_party/icu38/public/common/unicode/normlzr.h"
-#include "third_party/icu38/public/common/unicode/schriter.h"
-#include "third_party/icu38/public/common/unicode/uchar.h"
-#include "third_party/icu38/public/common/unicode/uscript.h"
-#include "third_party/icu38/public/common/unicode/uset.h"
-#include "third_party/icu38/public/i18n/unicode/ulocdata.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/uchar.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/ulocdata.h"
 
 SpellcheckCharAttribute::SpellcheckCharAttribute() {
   InitializeScriptTable();
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index f38a53e..c18a97f 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -17,7 +17,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "third_party/icu/public/common/unicode/ubidi.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3f67e10..57b4551 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -406,8 +406,8 @@
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
@@ -671,8 +671,8 @@
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -2674,8 +2674,8 @@
         'chrome_strings',
         'theme_resources',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'include_dirs': [
         '..',
@@ -2722,8 +2722,8 @@
         'chrome_strings',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -2781,8 +2781,8 @@
         'chrome_strings',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/webkit.gyp:glue',
         '../webkit/webkit.gyp:webkit',
@@ -3744,8 +3744,8 @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
@@ -3898,8 +3898,8 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/bzip2/bzip2.gyp:bzip2',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
@@ -5179,7 +5179,7 @@
             '../third_party/hunspell/hunspell.gyp:hunspell',
             '../net/net.gyp:net_resources',
             '../skia/skia.gyp:skia',
-            '../third_party/icu38/icu38.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icui18n',
             '../third_party/libpng/libpng.gyp:libpng',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/zlib/zlib.gyp:zlib',
@@ -5309,8 +5309,8 @@
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../third_party/icu38/icu38.gyp:icui18n',
-            '../third_party/icu38/icu38.gyp:icuuc',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
           ],
           'include_dirs': [
             '..',
@@ -5381,7 +5381,7 @@
             '../third_party/bzip2/bzip2.gyp:*',
             '../third_party/cld/cld.gyp:cld',
             '../third_party/codesighs/codesighs.gyp:*',
-            '../third_party/icu38/icu38.gyp:*',
+            '../third_party/icu/icu.gyp:*',
             '../third_party/libjpeg/libjpeg.gyp:*',
             '../third_party/libpng/libpng.gyp:*',
             '../third_party/libxml/libxml.gyp:*',
@@ -5511,8 +5511,8 @@
               '../webkit/webkit.gyp:webkit',
               '../skia/skia.gyp:skia',
               '../testing/gtest.gyp:gtest',
-              '../third_party/icu38/icu38.gyp:icui18n',
-              '../third_party/icu38/icu38.gyp:icuuc',
+              '../third_party/icu/icu.gyp:icui18n',
+              '../third_party/icu/icu.gyp:icuuc',
               '../third_party/libxml/libxml.gyp:libxml',
               '../third_party/npapi/npapi.gyp:npapi',
             ],
@@ -5594,8 +5594,8 @@
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../third_party/icu38/icu38.gyp:icui18n',
-            '../third_party/icu38/icu38.gyp:icuuc',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
           ],
           'include_dirs': [
             '..',
diff --git a/chrome/common/common.vsprops b/chrome/common/common.vsprops
index 05a4809..a834391 100644
--- a/chrome/common/common.vsprops
+++ b/chrome/common/common.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="common (chrome)"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 3c6e1f7..2997b2d 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -23,8 +23,8 @@
             '../chrome.gyp:chrome_strings',
             '../../courgette/courgette.gyp:courgette_lib',
             '../../third_party/bspatch/bspatch.gyp:bspatch',
-            '../../third_party/icu38/icu38.gyp:icui18n',
-            '../../third_party/icu38/icu38.gyp:icuuc',
+            '../../third_party/icu/icu.gyp:icui18n',
+            '../../third_party/icu/icu.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
           ],
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 229c994..4389884 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -157,7 +157,7 @@
                 '<(PRODUCT_DIR)/chrome.exe',
                 '<(PRODUCT_DIR)/chrome.dll',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
-                '<(PRODUCT_DIR)/icudt38.dll',
+                '<(PRODUCT_DIR)/icudt42.dll',
               ],
               'outputs': [
                 'xxx.out',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index cb675d7..20705f1 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -32,7 +32,7 @@ chrome.exe: %(ChromeDir)s\
 wow_helper.exe: %(ChromeDir)s\
 Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
 chrome.dll: %(VersionDir)s\
-icudt38.dll: %(VersionDir)s\
+icudt42.dll: %(VersionDir)s\
 gears.dll: %(VersionDir)s\
 Themes\default.dll: %(VersionDir)s\Themes
 locales\*.dll: %(VersionDir)s\Locales
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index 8218bb8..faa9cd2 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -6,7 +6,7 @@ chrome.dll
 crash_service.exe
 First Run
 gears.dll
-icudt38.dll
+icudt42.dll
 locales/ar.dll
 locales/bg.dll
 locales/bn.dll
diff --git a/chrome/tools/build/win/server.rules b/chrome/tools/build/win/server.rules
index b9ba301..6a1d870 100644
--- a/chrome/tools/build/win/server.rules
+++ b/chrome/tools/build/win/server.rules
@@ -9,7 +9,7 @@
 			DisplayName="Scan Server DLLs"

 			CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --header_output_dir=&quot;$(IntDir)&quot; --distribution=$(CHROMIUM_BUILD)"

 			Outputs="$(OutDir)/registered_dlls.h;"

-			AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt38.dll"

+			AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt42.dll"

 			FileExtensions="*.release"

 			ExecutionDescription="Scanning for COM Server DLLs..."

 			ShowOnlyRuleProperties="false"

diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 726529e..a36c07f 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -152,7 +152,7 @@ const IDNTestCase idn_cases[] = {
   {"xn--bcher-kva.de", L"b\x00fc" L"cher.de",
    {true,  false, false, false, false,
     false, false, false, false, true,
-    true,  true,  false, false, false,
+    true,  false,  false, false, false,
     true,  false, false, false, false,
     false}},
   // a with diaeresis
@@ -173,7 +173,7 @@ const IDNTestCase idn_cases[] = {
   {"xn--caf-dma.fr", L"caf\x00e9.fr",
    {true,  false, false, false, false,
     false, false, false, false, true,
-    false, true,  false, false, false,
+    false, true,  true,  false, false,
     false, false, false, false, false,
     false}},
   // c-cedillla and a with tilde (Portuguese)
diff --git a/net/net.gyp b/net/net.gyp
index 837cd13..00d5039 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -18,8 +18,8 @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../sdch/sdch.gyp:sdch',
         '../third_party/bzip2/bzip2.gyp:bzip2',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
         '../third_party/zlib/zlib.gyp:zlib',
         'net_resources',
@@ -415,8 +415,8 @@
             ],
             # Get U_STATIC_IMPLEMENTATION and -I directories on Linux.
             'dependencies': [
-              '../third_party/icu38/icu38.gyp:icui18n',
-              '../third_party/icu38/icu38.gyp:icuuc',
+              '../third_party/icu/icu.gyp:icui18n',
+              '../third_party/icu/icu.gyp:icuuc',
             ],
           },
         ],
@@ -556,7 +556,7 @@
         # TODO(mark): Specifying this here shouldn't be necessary.
         [ 'OS == "win"', {
             'dependencies': [
-              '../third_party/icu38/icu38.gyp:icudata',
+              '../third_party/icu/icu.gyp:icudata',
             ],
           },
         ],
@@ -584,7 +584,7 @@
         # TODO(mark): Specifying this here shouldn't be necessary.
         [ 'OS == "win"', {
             'dependencies': [
-              '../third_party/icu38/icu38.gyp:icudata',
+              '../third_party/icu/icu.gyp:icudata',
             ],
           },
         ],
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3e40dd1..c10b92b 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -19,8 +19,8 @@
         '../base/base.gyp:base_gfx',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
       'include_dirs': [
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium
index 659e650..8c7a407 100644
--- a/third_party/libxml/README.chromium
+++ b/third_party/libxml/README.chromium
@@ -17,6 +17,7 @@ includes the following modifications :
   (http://bugzilla.gnome.org/show_bug.cgi?id=502960 )
 * Applied security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=461015
 * Applied v2.6.26 version of security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=515195
+* Add an empty source file, xmldummy_mac.cc, to the tree to work around an Xcode bug.
 
 Current version: 2.6.32
 
diff --git a/third_party/libxml/build/libxml.vsprops b/third_party/libxml/build/libxml.vsprops
index a8392e2c..0a35f12 100644
--- a/third_party/libxml/build/libxml.vsprops
+++ b/third_party/libxml/build/libxml.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libxml"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 848c857..16f49d8 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -158,11 +158,11 @@
             'include',
           ],
           'dependencies': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
             '../zlib/zlib.gyp:zlib',
           ],
           'export_dependent_settings': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
           ],
           'direct_dependent_settings': {
             'defines': [
@@ -189,6 +189,7 @@
       'type': 'executable',
       'sources': [
         'xmlcatalog.c',
+        'xmldummy_mac.cc',
       ],
       'include_dirs': [
         '<(os_include)',
@@ -212,13 +213,14 @@
       'type': 'executable',
       'sources': [
         'xmllint.c',
+        'xmldummy_mac.cc',
       ],
       'include_dirs': [
         '<(os_include)',
       ],
       'dependencies': [
         'libxml',
-        '../icu38/icu38.gyp:icuuc',
+        '../icu/icu.gyp:icuuc',
       ],
       'conditions': [
         ['OS=="linux"', {
diff --git a/third_party/libxml/xmldummy_mac.cc b/third_party/libxml/xmldummy_mac.cc
new file mode 100644
index 0000000..181fd34
--- /dev/null
+++ b/third_party/libxml/xmldummy_mac.cc
@@ -0,0 +1,2 @@
+// This is a dummy file to work around an Xcode bug and to force Xcode to use
+// g++ instead of gcc when linking xmllint and xmlcatalog.
diff --git a/third_party/libxslt/build/libxslt.vsprops b/third_party/libxslt/build/libxslt.vsprops
index 4a41281..494585b 100644
--- a/third_party/libxslt/build/libxslt.vsprops
+++ b/third_party/libxslt/build/libxslt.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libxslt"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index c2cd656..9297345 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -186,8 +186,8 @@
             'src',
           ],
           'dependencies': [
-            '../icu38/icu38.gyp:icui18n',
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icui18n',
+            '../icu/icu.gyp:icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
@@ -215,7 +215,7 @@
           'target_name': 'sqlite_shell',
           'type': 'executable',
           'dependencies': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
             'sqlite',
           ],
           'sources': [
diff --git a/third_party/sqlite/src/shell_icu_win.c b/third_party/sqlite/src/shell_icu_win.c
index d68cf8f..afea472 100644
--- a/third_party/sqlite/src/shell_icu_win.c
+++ b/third_party/sqlite/src/shell_icu_win.c
@@ -9,16 +9,21 @@
 ** Returns 0 on failure, nonzero on success.
 ** This a hack job of icu_utils.cc:Initialize().  It's Chrome-specific code.
 */
+
+#define ICU_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 int sqlite_shell_init_icu() {
   HMODULE module;
   FARPROC addr;
   UErrorCode err;
-  
-  module = LoadLibrary(L"icudt38.dll");
+
+  wchar_t dll_name[12];
+  wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT);
+  dll_name[11] = L'\0';
+  module = LoadLibrary(dll_name);
   if (!module)
     return 0;
 
-  addr = GetProcAddress(module, "icudt38_dat");
+  addr = GetProcAddress(module, ICU_DATA_SYMBOL);
   if (!addr)
     return 0;
 
diff --git a/views/views.gyp b/views/views.gyp
index 0b04ca7..cb671da 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -46,8 +46,8 @@
         '../app/app.gyp:app_strings',
         '../app/app.gyp:app_resources',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 1b06416..06e9095 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -16,8 +16,8 @@
           'type': '<(library)',
           'dependencies': [
             '../../net/net.gyp:net_resources',
-            '../../third_party/icu38/icu38.gyp:icui18n',
-            '../../third_party/icu38/icu38.gyp:icuuc',
+            '../../third_party/icu/icu.gyp:icui18n',
+            '../../third_party/icu/icu.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/npapi/npapi.gyp:npapi',
             '../webkit.gyp:webkit_resources',
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 81e65e9..f7540fb 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -494,7 +494,7 @@
           'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
           'dependencies': [
             '../../../base/base.gyp:base',
-            '../../../third_party/icu38/icu38.gyp:icuuc',
+            '../../../third_party/icu/icu.gyp:icuuc',
             '../../../third_party/npapi/npapi.gyp:npapi',
           ],
           'sources': [
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index f1bb332..abd28b3 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -235,8 +235,8 @@
       'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
       'dependencies': [
         'config',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'include_dirs': [
         '../third_party/WebKit/JavaScriptCore',
@@ -263,8 +263,8 @@
       },
       'export_dependent_settings': [
         'config',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
       'conditions': [