Enable brand codes and master preferences on the Mac.

chrome/browser/first_run/first_run.h

Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 1bdf1cdcec2ff7eeb1c494bdc962a1ff8a446770..35c82ac031f969402dc62f52423c1adf063d5c87 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -74,12 +74,6 @@ class FirstRun {
       bool make_chrome_default,
       ProcessSingleton* process_singleton);
 
-  // Does platform specific setup. Called at the start of AutoImport.
-  static void PlatformSetup();
-
-  // Returns whether the first run should be "organic".
-  static bool IsOrganicFirstRun();
-
   // The master preferences is a JSON file with the same entries as the
   // 'Default\Preferences' file. This function locates this file from a standard
   // location and processes it so it becomes the default preferences in the
@@ -106,14 +100,6 @@ class FirstRun {
   // sentinel file could not be removed.
   static bool RemoveSentinel();
 
-  // Imports settings. This may be done in a separate process depending on the
-  // platform, but it will always block until done. The return value indicates
-  // success.
-  static bool ImportSettings(Profile* profile,
-                             scoped_refptr<ImporterHost> importer_host,
-                             scoped_refptr<ImporterList> importer_list,
-                             int items_to_import);
-
   // Sets the kShouldShowFirstRunBubble local state pref so that the browser
   // shows the bubble once the main message loop gets going (or refrains from
   // showing the bubble, if |show_bubble| is false). Returns false if the pref
@@ -145,10 +131,38 @@ class FirstRun {
   // being shown.
   static bool SearchEngineSelectorDisallowed();
 
+  // -- Platform-specific functions --
+
+  // Imports settings. This may be done in a separate process depending on the
+  // platform, but it will always block until done. The return value indicates
+  // success.
+  static bool ImportSettings(Profile* profile,
+                             scoped_refptr<ImporterHost> importer_host,
+                             scoped_refptr<ImporterList> importer_list,
+                             int items_to_import);
+
+  // Does platform specific setup. Called at the start of AutoImport.
+  static void PlatformSetup();
+
+  // Returns whether the first run should be "organic".
+  static bool IsOrganicFirstRun();
+
+  // Returns the path for the master preferences file.
+  static FilePath MasterPrefsPath();
+
  private:
   friend class FirstRunTest;
   FRIEND_TEST_ALL_PREFIXES(Toolbar5ImporterTest, BookmarkParse);
 
+  // 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);
+
+  // -- Platform-specific functions --
+
 #if defined(OS_WIN)
   // Writes the EULA to a temporary file, returned in |*eula_path|, and returns
   // true if successful.
@@ -176,20 +190,13 @@ class FirstRun {
                              gfx::NativeView parent_window);
 
   // Import browser items in this process. The browser and the items to
-  // import are encoded int the command line.
+  // import are encoded in the command line.
   static int ImportFromBrowser(Profile* profile, const CommandLine& cmdline);
 
 #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);
-
   enum FirstRunState {
     FIRST_RUN_UNKNOWN,  // The state is not tested or set yet.
     FIRST_RUN_TRUE,