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, 0 insertions, 8 deletions

diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index f4952eb..4ef364b 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -174,14 +174,6 @@ int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
   return return_code;
 }
 
-#if defined(OS_MACOSX)
-bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
-    const FilePath& master_prefs_path, MasterPrefs* out_prefs) {
-  NOTIMPLEMENTED();
-  return true;
-}
-#endif
-
 int FirstRunImportObserver::import_result() const {
   return import_result_;
 }