Moved GetUserDirectory() into mac_util.mm.

Made mac_util.mm and chrome_paths_mac.mm use GetUserDirectory().

Made firefox_importer_utils_mac.mm use PathService.

Added unittests for GetUserDirectory().

BUG=22045
TEST=trybots

Review URL: http://codereview.chromium.org/548123

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37206 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 11 deletions

diff --git a/base/mac_util.mm b/base/mac_util.mm
index b1f08a8..1c4ef73b 100644
--- a/base/mac_util.mm
+++ b/base/mac_util.mm
@@ -96,18 +96,24 @@ OSType CreatorCodeForApplication() {
   return CreatorCodeForCFBundleRef(bundle);
 }
 
-FilePath GetUserLibraryPath() {
-  NSArray* dirs = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
-                                                      NSUserDomainMask, YES);
-  if ([dirs count] == 0)
-    return FilePath();
-
-  NSString* library_dir = [dirs objectAtIndex:0];
-  const char* library_dir_path = [library_dir fileSystemRepresentation];
-  if (!library_dir_path)
-    return FilePath();
+bool GetUserDirectory(NSSearchPathDirectory directory, FilePath* result) {
+  DCHECK(result);
+  NSArray* dirs =
+      NSSearchPathForDirectoriesInDomains(directory, NSUserDomainMask, YES);
+  if ([dirs count] < 1) {
+    return false;
+  }
+  NSString* path = [dirs objectAtIndex:0];
+  *result = FilePath([path fileSystemRepresentation]);
+  return true;
+}
 
-  return FilePath(library_dir_path);
+FilePath GetUserLibraryPath() {
+  FilePath user_library_path;
+  if (!GetUserDirectory(NSLibraryDirectory, &user_library_path)) {
+    LOG(WARNING) << "Could not get user library path";
+  }
+  return user_library_path;
 }
 
 CGColorSpaceRef GetSRGBColorSpace() {