While importing favicon, make sure there is an entry in the history db.

This will match with what history db does for regular bookmarked URLs with favicons - when history db is cleaned, we keep an entry in the db with 0 visits as long as that url is bookmarked.

BUG=13338

Review URL: http://codereview.chromium.org/193053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26014 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 0a951ad..a509f55 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -38,6 +38,16 @@ void Firefox3Importer::StartImport(ProfileInfo profile_info,
   NotifyStarted();
   if ((items & HOME_PAGE) && !cancelled())
     ImportHomepage();  // Doesn't have a UI item.
+
+  // Note history should be imported before bookmarks because bookmark import
+  // will also import favicons and we store favicon for a URL only if the URL
+  // exist in history or bookmarks.
+  if ((items & HISTORY) && !cancelled()) {
+    NotifyItemStarted(HISTORY);
+    ImportHistory();
+    NotifyItemEnded(HISTORY);
+  }
+
   if ((items & FAVORITES) && !cancelled()) {
     NotifyItemStarted(FAVORITES);
     ImportBookmarks();
@@ -53,11 +63,6 @@ void Firefox3Importer::StartImport(ProfileInfo profile_info,
     ImportPasswords();
     NotifyItemEnded(PASSWORDS);
   }
-  if ((items & HISTORY) && !cancelled()) {
-    NotifyItemStarted(HISTORY);
-    ImportHistory();
-    NotifyItemEnded(HISTORY);
-  }
   NotifyEnded();
 }