Slight cleanup of some first-run/master-prefs stuff.

- let AddFirstRunNewTabs() run as elsewhere on Mac (the list of first-run tabs
  will be empty)
- move various #if defined(OS_MACOSX) stuff to (existing!) Mac-specific files
  instead
- remove an essentially-unused argument to FirstRun::ProcessMasterPreferences()
  (the location of the master prefs was never specified, so the standard
  location was always used)

BUG=none
TEST=everything still works

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

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

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run_gtk.cc
index 2b48d3b..4183fe3 100644
--- a/chrome/browser/first_run_gtk.cc
+++ b/chrome/browser/first_run_gtk.cc
@@ -42,17 +42,14 @@ FilePath GetDefaultPrefFilePath(bool create_profile_dir,
 }
 
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
-                                        const FilePath& master_prefs_path,
                                         MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
-  FilePath master_prefs = master_prefs_path;
-  if (master_prefs.empty()) {
-    // The default location of the master prefs is next to the chrome binary.
-    if (!PathService::Get(base::DIR_EXE, &master_prefs))
-      return true;
-    master_prefs =
-        master_prefs.AppendASCII(installer_util::kDefaultMasterPrefs);
-  }
+
+  // The standard location of the master prefs is next to the chrome binary.
+  FilePath master_prefs;
+  if (!PathService::Get(base::DIR_EXE, &master_prefs))
+    return true;
+  master_prefs = master_prefs.AppendASCII(installer_util::kDefaultMasterPrefs);
 
   scoped_ptr<DictionaryValue> prefs(
       installer_util::ParseDistributionPreferences(master_prefs));