Transition to base/mac/bundle_locations.h step 1

base/i18n/icu_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/icu_util.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 91 matching lines @@
 #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.
+    // Assume it is in the framework bundle's Resources directory.
     FilePath data_path =
-      base::mac::PathForMainAppBundleResource(CFSTR(ICU_UTIL_DATA_FILE_NAME));
+      base::mac::PathForFrameworkBundleResource(CFSTR(ICU_UTIL_DATA_FILE_NAME));
     if (data_path.empty()) {
       DLOG(ERROR) << ICU_UTIL_DATA_FILE_NAME << " not found in bundle";
       return false;
     }
     if (!mapped_file.Initialize(data_path)) {
       DLOG(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
 }
 
 }  // namespace icu_util