From 640517fdd23e08ed95cf129d27457db817ee6124 Mon Sep 17 00:00:00 2001 From: "evanm@google.com" Date: Thu, 30 Oct 2008 23:54:04 +0000 Subject: Begin the first small step towards using FilePath everywhere: - Add some transition APIs. - Start migrating some code to transition APIs. Review URL: http://codereview.chromium.org/8825 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4254 0039d316-1c4b-4281-b951-d872f2087c98 --- base/base_paths_linux.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'base/base_paths_linux.cc') diff --git a/base/base_paths_linux.cc b/base/base_paths_linux.cc index abbc91e..d161114 100644 --- a/base/base_paths_linux.cc +++ b/base/base_paths_linux.cc @@ -6,6 +6,7 @@ #include +#include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -15,7 +16,7 @@ namespace base { bool PathProviderLinux(int key, std::wstring* result) { - std::wstring cur; + FilePath path; switch (key) { case base::FILE_EXE: case base::FILE_MODULE: { // TODO(evanm): is this correct? @@ -32,10 +33,11 @@ bool PathProviderLinux(int key, std::wstring* result) { case base::DIR_SOURCE_ROOT: // On linux, unit tests execute two levels deep from the source root. // For example: chrome/{Debug|Hammer}/net_unittest - PathService::Get(base::DIR_EXE, &cur); - file_util::UpOneDirectory(&cur); - file_util::UpOneDirectory(&cur); - *result = cur; + if (!PathService::Get(base::DIR_EXE, &path)) + return false; + path = path.Append(FilePath::kParentDirectory) + .Append(FilePath::kParentDirectory); + *result = path.ToWStringHack(); return true; } return false; -- cgit v1.1