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

2 files changed, 12 insertions, 48 deletions

diff --git a/chrome/browser/importer/firefox_importer_utils_mac.mm b/chrome/browser/importer/firefox_importer_utils_mac.mm
index bea6b71..08f222d 100644
--- a/chrome/browser/importer/firefox_importer_utils_mac.mm
+++ b/chrome/browser/importer/firefox_importer_utils_mac.mm
@@ -7,27 +7,18 @@
 #include "chrome/browser/importer/firefox_importer_utils.h"
 
 #include "base/file_util.h"
+#include "base/path_service.h"
 
 FilePath GetProfilesINI() {
-  FilePath ini_file;
-  NSArray* dirs =
-      NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
-                                          NSUserDomainMask, YES);
-  if ([dirs count]) {
-    NSString* app_support_dir = [dirs objectAtIndex:0];
-    NSString* firefox_dir = [app_support_dir
-        stringByAppendingPathComponent:@"Firefox"];
-    NSString* profiles_ini = [firefox_dir
-        stringByAppendingPathComponent:@"profiles.ini"];
-    if (profiles_ini) {
-      ini_file = FilePath([profiles_ini fileSystemRepresentation]);
-    }
+  FilePath app_data_path;
+  if (!PathService::Get(base::DIR_APP_DATA, &app_data_path)) {
+    return FilePath();
   }
-
-  if (file_util::PathExists(ini_file))
-    return ini_file;
-
-  return FilePath();
+  FilePath ini_file = app_data_path.Append("Firefox").Append("profiles.ini");
+  if (!file_util::PathExists(ini_file)) {
+    return FilePath();
+  }
+  return ini_file;
 }
 
 FilePath GetFirefoxDylibPath() {
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() {