| Index: base/base_paths_mac.mm
|
| diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
|
| index 630f742a9ffbd16ac5e3779b1a99065714227397..39a58143a60c23945e6e2659254c20a673d03c4f 100644
|
| --- a/base/base_paths_mac.mm
|
| +++ b/base/base_paths_mac.mm
|
| @@ -21,7 +21,7 @@
|
|
|
| namespace {
|
|
|
| -void GetNSExecutablePath(FilePath* path) {
|
| +void GetNSExecutablePath(base::FilePath* path) {
|
| DCHECK(path);
|
| // Executable path can have relative references ("..") depending on
|
| // how the app was launched.
|
| @@ -32,19 +32,19 @@ void GetNSExecutablePath(FilePath* path) {
|
| int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length),
|
| &executable_length);
|
| DCHECK_EQ(rv, 0);
|
| - *path = FilePath(executable_path);
|
| + *path = base::FilePath(executable_path);
|
| }
|
|
|
| // Returns true if the module for |address| is found. |path| will contain
|
| // the path to the module. Note that |path| may not be absolute.
|
| -bool GetModulePathForAddress(FilePath* path,
|
| +bool GetModulePathForAddress(base::FilePath* path,
|
| const void* address) WARN_UNUSED_RESULT;
|
|
|
| -bool GetModulePathForAddress(FilePath* path, const void* address) {
|
| +bool GetModulePathForAddress(base::FilePath* path, const void* address) {
|
| Dl_info info;
|
| if (dladdr(address, &info) == 0)
|
| return false;
|
| - *path = FilePath(info.dli_fname);
|
| + *path = base::FilePath(info.dli_fname);
|
| return true;
|
| }
|
|
|
| @@ -52,7 +52,7 @@ bool GetModulePathForAddress(FilePath* path, const void* address) {
|
|
|
| namespace base {
|
|
|
| -bool PathProviderMac(int key, FilePath* result) {
|
| +bool PathProviderMac(int key, base::FilePath* result) {
|
| switch (key) {
|
| case base::FILE_EXE:
|
| GetNSExecutablePath(result);
|
|
|