Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/firefox2_importer.cc

 // Copyright (c) 2012 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/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
+#include "chrome/browser/favicon/favicon_util.h"
+#include "chrome/browser/favicon/imported_favicon_usage.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/importer_util.h"
 #include "chrome/browser/importer/mork_reader.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/password_form.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
 
@@ skipping 107 matching lines @@
   data.SetKeyword(keyword);
   data.SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
   return new TemplateURL(NULL, data);
 }
 
 // static
 void Firefox2Importer::ImportBookmarksFile(
     const base::FilePath& file_path,
     const std::set<GURL>& default_urls,
     Importer* importer,
-    std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+    std::vector<ImportedBookmarkEntry>* bookmarks,
     std::vector<TemplateURL*>* template_urls,
-    std::vector<history::ImportedFaviconUsage>* favicons) {
+    std::vector<ImportedFaviconUsage>* favicons) {
   std::string content;
   file_util::ReadFileToString(file_path, &content);
   std::vector<std::string> lines;
   base::SplitString(content, '\n', &lines);
 
   string16 last_folder;
   bool last_folder_on_toolbar = false;
   bool last_folder_is_empty = true;
   bool has_subfolder = false;
   base::Time last_folder_add_date;
@@ skipping 34 matching lines @@
 
     if (is_bookmark &&
         post_data.empty() &&
         CanImportURL(GURL(url)) &&
         default_urls.find(url) == default_urls.end()) {
       if (toolbar_folder > path.size() && !path.empty()) {
         NOTREACHED();  // error in parsing.
         break;
       }
 
-      ProfileWriter::BookmarkEntry entry;
+      ImportedBookmarkEntry entry;
       entry.creation_time = add_date;
       entry.url = url;
       entry.title = title;
 
       if (toolbar_folder) {
         // The toolbar folder should be at the top level.
         entry.in_toolbar = true;
         entry.path.assign(path.begin() + toolbar_folder - 1, path.end());
       } else {
         // Add this bookmark to the list of |bookmarks|.
@@ skipping 35 matching lines @@
       last_folder_is_empty = true;
     } else if (StartsWithASCII(line, "</DL>", false)) {
       if (path.empty())
         break;  // Mismatch <DL>.
 
       string16 folder_title = path.back();
       path.pop_back();
 
       if (last_folder_is_empty) {
         // Empty folder should be added explicitly.
-        ProfileWriter::BookmarkEntry entry;
+        ImportedBookmarkEntry entry;
         entry.is_folder = true;
         entry.creation_time = last_folder_add_date;
         entry.title = folder_title;
         if (toolbar_folder) {
           // The toolbar folder should be at the top level.
           // Make sure we don't add the toolbar folder itself if it is empty.
           if (toolbar_folder <= path.size()) {
             entry.in_toolbar = true;
             entry.path.assign(path.begin() + toolbar_folder - 1, path.end());
             bookmarks->push_back(entry);
@@ skipping 14 matching lines @@
   }
 }
 
 void Firefox2Importer::ImportBookmarks() {
   // Load the default bookmarks.
   std::set<GURL> default_urls;
   if (!parsing_bookmarks_html_file_)
     LoadDefaultBookmarks(app_path_, &default_urls);
 
   // Parse the bookmarks.html file.
-  std::vector<ProfileWriter::BookmarkEntry> bookmarks, toolbar_bookmarks;
+  std::vector<ImportedBookmarkEntry> bookmarks, toolbar_bookmarks;
   std::vector<TemplateURL*> template_urls;
-  std::vector<history::ImportedFaviconUsage> favicons;
+  std::vector<ImportedFaviconUsage> favicons;
   base::FilePath file = source_path_;
   if (!parsing_bookmarks_html_file_)
     file = file.AppendASCII("bookmarks.html");
 
   ImportBookmarksFile(file, default_urls, this, &bookmarks, &template_urls,
                       &favicons);
 
   // Write data into profile.
   if (!bookmarks.empty() && !cancelled()) {
     string16 first_folder_name = bridge_->GetLocalizedString(
@@ skipping 319 matching lines @@
   while (!file.empty()) {
     xml_files->push_back(file);
     file = file_enum.Next();
   }
 }
 
 // static
 void Firefox2Importer::DataURLToFaviconUsage(
     const GURL& link_url,
     const GURL& favicon_data,
-    std::vector<history::ImportedFaviconUsage>* favicons) {
+    std::vector<ImportedFaviconUsage>* favicons) {
   if (!link_url.is_valid() || !favicon_data.is_valid() ||
       !favicon_data.SchemeIs(chrome::kDataScheme))
     return;
 
   // Parse the data URL.
   std::string mime_type, char_set, data;
   if (!net::DataURL::Parse(favicon_data, &mime_type, &char_set, &data) ||
       data.empty())
     return;
 
-  history::ImportedFaviconUsage usage;
-  if (!importer::ReencodeFavicon(
+  ImportedFaviconUsage usage;
+  if (!FaviconUtil::ReencodeFavicon(
           reinterpret_cast<const unsigned char*>(&data[0]),
           data.size(), &usage.png_data))
     return;  // Unable to decode.
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }