Reworked Avi's patch for master prefs implemented on mac to work with new fir...

chrome/browser/first_run/first_run.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 113 matching lines @@
   // Sets the kShouldShowWelcomePage local state pref so that the browser
   // loads the welcome tab once the message loop gets going. Returns false
   // if the pref could not be set.
   static bool SetShowWelcomePagePref();
 
  private:
   friend class FirstRunTest;
   FRIEND_TEST_ALL_PREFIXES(Toolbar5ImporterTest, BookmarkParse);
 
 #if defined(OS_WIN)
+  // Writes the EULA to a temporary file, returned in |*eula_path|, and returns
+  // true if successful.
+  static bool WriteEULAtoTempFile(FilePath* eula_path);
+  // Launches the setup exe with the given parameter/value on the command-line,
+  // waits for its termination, returns its exit code in |*ret_code|, and
+  // returns true if the exit code is valid.
+  static bool LaunchSetupWithParam(const std::string& param,
+                                   const std::wstring& value,
+                                   int* ret_code);
+  // Installs a task to do an extensions update check once the extensions system
+  // is running.
+  static void DoDelayedInstallExtensions();
   // Imports settings in a separate process. It is the implementation of the
   // public version.  |skip_first_run_ui| is true if no first run UI should
   // appear (search engine dialog, Firefox import warning dialog).
   static bool ImportSettings(Profile* profile, int browser_type,
                              int items_to_import,
                              const FilePath& import_path,
                              bool skip_first_run_ui,
                              gfx::NativeView parent_window);
   // Import browser items in this process. The browser and the items to
   // import are encoded int the command line.
   static int ImportFromBrowser(Profile* profile, const CommandLine& cmdline);
-#elif defined(OS_LINUX)
+#else
   static bool ImportBookmarks(const FilePath& import_bookmarks_path);
 #endif
 
   // Import bookmarks from an html file. The path to the file is provided in
   // the command line.
   static int ImportFromFile(Profile* profile, const CommandLine& cmdline);
 
   // Gives the full path to the sentinel file. The file might not exist.
   static bool GetFirstRunSentinelFilePath(FilePath* path);
 
@@ skipping 143 matching lines @@
 // or closed the dialog.
 bool OpenFirstRunDialog(Profile* profile,
                         bool homepage_defined,
                         int import_items,
                         int dont_import_items,
                         bool search_engine_experiment,
                         bool randomize_search_engine_experiment,
                         ProcessSingleton* process_singleton);
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_