Add support for ICU data in a data file.

- Mac Foundation utility for fetching a resource from the MainAppBundle.
- Bringing in newer ICU dep that has optional support for using the ICU data
  file.
- If Mac is built using a ICU data file, directly map in the data so it will
  work even in a sandboxed process.

**The build does not use this data file support at this time.**

This might help the Mac bots as it means each unittest that depends on base
will be ~10meg smaller, helping link and also helping with the copy of bits
from the builder to the tester.

If Mac ever support a Universal binary (32bit and 64bit) it will also probably
want to use this to avoid carrying two copies of the ICU data.

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

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

1 files changed, 36 insertions, 1 deletions

diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index d378a25..eb7a688 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -21,6 +21,10 @@
 #include "unicode/putil.h"
 #include "unicode/udata.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/foundation_util.h"
+#endif
+
 #define ICU_UTIL_DATA_FILE   0
 #define ICU_UTIL_DATA_SHARED 1
 #define ICU_UTIL_DATA_STATIC 2
@@ -35,10 +39,14 @@
 
 #endif  // ICU_UTIL_DATA_IMPL
 
-#if defined(OS_WIN)
+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
+#define ICU_UTIL_DATA_FILE_NAME "icudt" U_ICU_VERSION_SHORT "l.dat"
+#elif ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
 #define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
+#if defined(OS_WIN)
 #define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt" U_ICU_VERSION_SHORT ".dll"
 #endif
+#endif
 
 namespace icu_util {
 
@@ -78,6 +86,7 @@ bool Initialize() {
   // Mac/Linux bundle the ICU data in.
   return true;
 #elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
+#if !defined(OS_MACOSX)
   // For now, expect the data file to be alongside the executable.
   // This is sufficient while we work on unit tests, but will eventually
   // likely live in a data directory.
@@ -90,6 +99,32 @@ bool Initialize() {
   UErrorCode err = U_ZERO_ERROR;
   udata_setFileAccess(UDATA_ONLY_PACKAGES, &err);
   return err == U_ZERO_ERROR;
+#else
+  // If the ICU data directory is set, ICU won't actually load the data until
+  // it is needed.  This can fail if the process is sandboxed at that time.
+  // Instead, Mac maps the file in and hands off the data so the sandbox won't
+  // cause any problems.
+
+  // Chrome doesn't normally shut down ICU, so the mapped data shouldn't ever
+  // be released.
+  static file_util::MemoryMappedFile mapped_file;
+  if (!mapped_file.IsValid()) {
+    // Assume it is in the MainBundle's Resources directory.
+    FilePath data_path =
+      base::mac::PathForMainAppBundleResource(CFSTR(ICU_UTIL_DATA_FILE_NAME));
+    if (data_path.empty()) {
+      LOG(ERROR) << ICU_UTIL_DATA_FILE_NAME << " not found in bundle";
+      return false;
+    }
+    if (!mapped_file.Initialize(data_path)) {
+      LOG(ERROR) << "Couldn't mmap " << data_path.value();
+      return false;
+    }
+  }
+  UErrorCode err = U_ZERO_ERROR;
+  udata_setCommonData(const_cast<uint8*>(mapped_file.data()), &err);
+  return err == U_ZERO_ERROR;
+#endif  // OS check
 #endif
 }