Move more code to using FilePath.

base/base_paths_mac.mm

 // 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/base_paths_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 
 namespace base {
 
-bool PathProviderMac(int key, std::wstring* result) {
+bool PathProviderMac(int key, FilePath* result) {
   std::wstring cur;
   switch (key) {
     case base::FILE_EXE:
     case base::FILE_MODULE: {
       NSString* path = [[NSBundle mainBundle] executablePath];
       cur = reinterpret_cast<const wchar_t*>(
           [path cStringUsingEncoding:NSUTF32StringEncoding]);
       break;
     }
     case base::DIR_APP_DATA:
@@ skipping 15 matching lines @@
       // On the mac, unit tests execute two levels deep from the source root.
       // For example: src/xcodebuild/{Debug|Release}/base_unittests
       PathService::Get(base::DIR_EXE, &cur);
       file_util::UpOneDirectory(&cur);
       file_util::UpOneDirectory(&cur);
       break;
     default:
       return false;
   }
 
-  result->swap(cur);
+  *result = FilePath::FromWStringHack(cur);
   return true;
 }
 
 }  // namespace base