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

chrome/browser/first_run/first_run_mac.mm

Index: chrome/browser/first_run/first_run_mac.mm
===================================================================
--- chrome/browser/first_run/first_run_mac.mm	(revision 57069)
+++ chrome/browser/first_run/first_run_mac.mm	(working copy)
@@ -57,13 +57,6 @@
   return controller->DoFirstRun(profile, process_singleton);
 }
 
-bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
-                                        MasterPrefs* out_prefs) {
-  // TODO(jeremy,viettrungluu): http://crbug.com/44901
-  NOTIMPLEMENTED();
-  return true;
-}
-
 FirstRunController::FirstRunController()
     : importer_host_(new ExternalProcessImporterHost) {
 }
@@ -156,3 +149,7 @@
 
   return true;
 }
+bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
+  // http://crbug.com/48880
+  return false;
+}