Deprecate PathService::Get(..., wstring*) and use FilePath instead.

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 38 matching lines @@
   // Assert that we are not called more than once.  Even though calling this
   // function isn't harmful (ICU can handle it), being called twice probably
   // indicates a programming error.
   static bool called_once = false;
   DCHECK(!called_once);
   called_once = true;
 #endif
 
 #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
   // We expect to find the ICU data module alongside the current module.
-  std::wstring data_path;
+  FilePath data_path;
   PathService::Get(base::DIR_MODULE, &data_path);
-  file_util::AppendToPath(&data_path,
-                          ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));
+  data_path = data_path.Append(ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));

[tony, 2009/10/19 22:46:49]

Nit: AppendASCII?

 
-  HMODULE module = LoadLibrary(data_path.c_str());
+  HMODULE module = LoadLibrary(data_path.value().c_str());
   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) {
     LOG(ERROR) << ICU_UTIL_DATA_SYMBOL << ": not found in "
                << ICU_UTIL_DATA_SHARED_MODULE_NAME;
     return false;
@@ skipping 15 matching lines @@
   u_setDataDirectory(data_path.value().c_str());
   // Only look for the packaged data file;
   // the default behavior is to look for individual files.
   UErrorCode err = U_ZERO_ERROR;
   udata_setFileAccess(UDATA_ONLY_PACKAGES, &err);
   return err == U_ZERO_ERROR;
 #endif
 }
 
 }  // namespace icu_util