Firefox import broken for first run on Mac

chrome/browser/importer/importer_list.cc

 // 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/importer/importer_list.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 17 matching lines @@
 #endif
 
 ImporterList::ImporterList() {
 }
 
 ImporterList::~ImporterList() {
   STLDeleteContainerPointers(source_profiles_.begin(), source_profiles_.end());
 }
 
 void ImporterList::DetectSourceProfiles() {
+// The first run import will automatically take settings from the first
+// profile detected, which should be the user's current default.
 #if defined(OS_WIN)
-  // The order in which detect is called determines the order
-  // in which the options appear in the dropdown combo-box
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles();
     DetectIEProfiles();
   } else {
     DetectIEProfiles();
     DetectFirefoxProfiles();
   }
   // TODO(brg) : Current UI requires win_util.
   DetectGoogleToolbarProfiles();
+#elif defined(OS_MACOSX)
+  if (ShellIntegration::IsFirefoxDefaultBrowser()) {
+    DetectFirefoxProfiles();
+    DetectSafariProfiles();
+  } else {
+    DetectSafariProfiles();
+    DetectFirefoxProfiles();
+  }
 #else
-#if defined(OS_MACOSX)
-  DetectSafariProfiles();
-#endif
   DetectFirefoxProfiles();
 #endif
 }
 
 Importer* ImporterList::CreateImporterByType(importer::ProfileType type) {
   switch (type) {
 #if defined(OS_WIN)
     case importer::MS_IE:
       return new IEImporter();
 #endif
@@ skipping 115 matching lines @@
     importer::ProfileInfo* safari = new importer::ProfileInfo();
     safari->browser_type = importer::SAFARI;
     safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
     safari->source_path.clear();
     safari->app_path.clear();
     safari->services_supported = items;
     source_profiles_.push_back(safari);
   }
 }
 #endif  // OS_MACOSX