Move more code to using FilePath.

chrome/common/chrome_paths.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #endif
 
 #include "chrome/common/chrome_paths.h"
 
 #include "base/command_line.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/sys_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace chrome {
 
 // Gets the default user data directory, regardless of whether
@@ skipping 19 matching lines @@
 #ifndef NDEBUG
   // for debugging, support a cmd line based override
   CommandLine command_line;
   *path = command_line.GetSwitchValue(switches::kGearsPluginPathOverride);
   return !path->empty();
 #else
   return false;
 #endif
 }
 
-bool PathProvider(int key, std::wstring* result) {
+bool PathProvider(int key, FilePath* result) {
   // Some keys are just aliases...
   switch (key) {
     case chrome::DIR_APP:
       return PathService::Get(base::DIR_MODULE, result);
     case chrome::DIR_LOGS:
 #ifndef NDEBUG
       return PathService::Get(chrome::DIR_USER_DATA, result);
 #else
       return PathService::Get(base::DIR_EXE, result);
 #endif
@@ skipping 188 matching lines @@
         return false;
       exists = true;
       break;
     default:
       return false;
   }
 
   if (!exists && !file_util::PathExists(cur) && !file_util::CreateDirectory(cur))
     return false;
 
-  result->swap(cur);
+  *result = FilePath::FromWStringHack(cur);
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome