Reland "Add option to import from bookmarks html file to ...""

chrome/browser/importer/importer_list.cc

Index: chrome/browser/importer/importer_list.cc
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 1863d4a46c9f34bd258cc55c423435099774a3d6..598843e4c98ae672d386cdb9bea5b88c2e1ba911 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -175,6 +175,12 @@ void ImporterList::DetectSourceProfilesWorker(const std::string& locale) {
 #else
   DetectFirefoxProfiles(locale, &profiles);
 #endif
+  importer::SourceProfile* bookmarks_file = new importer::SourceProfile;

[gab, 2013/09/17 22:06:00]

Adding this here is problematic on AutoImport where we always import from the
first importer in this list (this could previously be empty, but will now
contain this entry).

This entry is not however suitable for silent AutoImport as:
1) TYPE_BOOKMARKS_FILE has no entry in
importer_creator.cc::CreateImporterByType()
2) Even if it did, it's unclear which file it should silently import from...

As it is if Chrome goes through first run on a computer with no other browsers,
it will hit NOTREACHED() @
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/utility/imp...

+  bookmarks_file->importer_name =
+      l10n_util::GetStringUTF16(IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE);
+  bookmarks_file->importer_type = importer::TYPE_BOOKMARKS_FILE;
+  bookmarks_file->services_supported = importer::FAVORITES;
+  profiles.push_back(bookmarks_file);
 
   // TODO(jhawkins): Remove this condition once DetectSourceProfilesHack is
   // removed.