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

chrome/browser/first_run/first_run_mac.mm

 // 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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/app/breakpad_mac.h"
 #import "chrome/browser/cocoa/first_run_dialog.h"
@@ skipping 39 matching lines @@
                         bool homepage_defined,
                         int import_items,
                         int dont_import_items,
                         bool search_engine_experiment,
                         bool randomize_search_engine_experiment,
                         ProcessSingleton* process_singleton) {
   FirstRunController* controller = new FirstRunController;
   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) {
 }
 
 void FirstRunController::FirstRunDone() {
   // Set preference to show first run bubble and welcome page.
   FirstRun::SetShowFirstRunBubblePref(true);
   FirstRun::SetShowWelcomePagePref();
 }
 
@@ skipping 72 matching lines @@
     ignore_result(gc.release());
     StartImportingWithUI(nil, items, importer_host_.get(),
                          source_profile, profile, this, true);
   } else {
     // This is called by the importer if it runs.
     FirstRunDone();
   }
 
   return true;
 }
+bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
+  // http://crbug.com/48880
+  return false;
+}