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, 3 insertions, 30 deletions

diff --git a/chrome/common/chrome_paths_mac.mm b/chrome/common/chrome_paths_mac.mm
index f401751..21868cd 100644
--- a/chrome/common/chrome_paths_mac.mm
+++ b/chrome/common/chrome_paths_mac.mm
@@ -41,42 +41,15 @@ bool GetChromeFrameUserDataDirectory(FilePath* result) {
 }
 
 bool GetUserDocumentsDirectory(FilePath* result) {
-  bool success = false;
-  NSArray* docArray =
-      NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
-                                          NSUserDomainMask,
-                                          YES);
-  if ([docArray count] && result) {
-    *result = FilePath([[docArray objectAtIndex:0] fileSystemRepresentation]);
-    success = true;
-  }
-  return success;
+  return mac_util::GetUserDirectory(NSDocumentDirectory, result);
 }
 
 bool GetUserDownloadsDirectory(FilePath* result) {
-  bool success = false;
-  NSArray* docArray =
-      NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory,
-                                          NSUserDomainMask,
-                                          YES);
-  if ([docArray count] && result) {
-    *result = FilePath([[docArray objectAtIndex:0] fileSystemRepresentation]);
-    success = true;
-  }
-  return success;
+  return mac_util::GetUserDirectory(NSDownloadsDirectory, result);
 }
 
 bool GetUserDesktop(FilePath* result) {
-  bool success = false;
-  NSArray* docArray =
-      NSSearchPathForDirectoriesInDomains(NSDesktopDirectory,
-                                          NSUserDomainMask,
-                                          YES);
-  if ([docArray count] && result) {
-    *result = FilePath([[docArray objectAtIndex:0] fileSystemRepresentation]);
-    success = true;
-  }
-  return success;
+  return mac_util::GetUserDirectory(NSDesktopDirectory, result);
 }
 
 FilePath GetVersionedDirectory() {