Move more code to using FilePath.

base/path_service.cc

 // Copyright (c) 2006-2008 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/path_service.h"
 
 #ifdef OS_WIN
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #endif
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 
 namespace base {
-  bool PathProvider(int key, std::wstring* result);
+  bool PathProvider(int key, FilePath* result);
 #if defined(OS_WIN)
-  bool PathProviderWin(int key, std::wstring* result);
+  bool PathProviderWin(int key, FilePath* result);
 #elif defined(OS_MACOSX)
-  bool PathProviderMac(int key, std::wstring* result);
+  bool PathProviderMac(int key, FilePath* result);
 #elif defined(OS_LINUX)
-  bool PathProviderLinux(int key, std::wstring* result);
+  bool PathProviderLinux(int key, FilePath* result);
 #endif
 }
 
 namespace {
 
 typedef base::hash_map<int, FilePath> PathMap;
 typedef base::hash_set<int> PathSet;
 
 // We keep a linked list of providers.  In a debug build we ensure that no two
 // providers claim overlapping keys.
@@ skipping 120 matching lines @@
   DCHECK(result);
   DCHECK(key >= base::DIR_CURRENT);
 
   // special case the current directory because it can never be cached
   if (key == base::DIR_CURRENT)
     return file_util::GetCurrentDirectory(result);
 
   if (GetFromCache(key, result))
     return true;
   
-  std::wstring path_string;
+  FilePath path;
 
   // search providers for the requested path
   // NOTE: it should be safe to iterate here without the lock
   // since RegisterProvider always prepends.
   Provider* provider = path_data->providers;
   while (provider) {
-    if (provider->func(key, &path_string))
+    if (provider->func(key, &path))
       break;
-    DCHECK(path_string.empty()) << "provider should not have modified path";
+    DCHECK(path.value().empty()) << "provider should not have modified path";
     provider = provider->next;
   }
 
-  if (path_string.empty())
+  if (path.value().empty())
     return false;
 
-  FilePath path = FilePath::FromWStringHack(path_string);
   AddToCache(key, path);
   
   *result = path;
   return true;
 }
 
 // static
 bool PathService::Get(int key, std::wstring* result) {
   // Deprecated compatibility function.
   FilePath path;
@@ skipping 58 matching lines @@
   p = new Provider;
   p->is_static = false;
   p->func = func;
   p->next = path_data->providers;
 #ifndef NDEBUG
   p->key_start = key_start;
   p->key_end = key_end;
 #endif
   path_data->providers = p;
 }