| Index: base/mac/bundle_locations.mm
|
| diff --git a/base/mac/bundle_locations.mm b/base/mac/bundle_locations.mm
|
| index 36fad66de6b3316ddc1d89c79e7b6b1db892fb2a..363b7ead195840487e9ffee074ad1a48a49c2574 100644
|
| --- a/base/mac/bundle_locations.mm
|
| +++ b/base/mac/bundle_locations.mm
|
| @@ -5,6 +5,7 @@
|
| #include "base/mac/bundle_locations.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/mac/foundation_util.h"
|
| #include "base/sys_string_conversions.h"
|
|
|
| namespace base {
|
| @@ -21,7 +22,7 @@ NSBundle* MainBundle() {
|
|
|
| FilePath MainBundlePath() {
|
| NSBundle* bundle = MainBundle();
|
| - return FilePath([[bundle bundlePath] fileSystemRepresentation]);
|
| + return NSStringToFilePath([bundle bundlePath]);
|
| }
|
|
|
| NSBundle* OuterBundle() {
|
| @@ -32,7 +33,7 @@ NSBundle* OuterBundle() {
|
|
|
| FilePath OuterBundlePath() {
|
| NSBundle* bundle = OuterBundle();
|
| - return FilePath([[bundle bundlePath] fileSystemRepresentation]);
|
| + return NSStringToFilePath([bundle bundlePath]);
|
| }
|
|
|
| NSBundle* FrameworkBundle() {
|
| @@ -43,7 +44,7 @@ NSBundle* FrameworkBundle() {
|
|
|
| FilePath FrameworkBundlePath() {
|
| NSBundle* bundle = FrameworkBundle();
|
| - return FilePath([[bundle bundlePath] fileSystemRepresentation]);
|
| + return NSStringToFilePath([bundle bundlePath]);
|
| }
|
|
|
| static void AssignOverrideBundle(NSBundle* new_bundle,
|
|
|