Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/profile_import_process_messages.h

 // 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.
 
 // Multiply-included message file, no traditonal include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/values.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
+#include "chrome/browser/favicon/imported_favicon_usage.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/profile_writer.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/common_param_traits_macros.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/password_form.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
 
@@ skipping 93 matching lines @@
     l->append(", ");
     LogParam(p.typed_count(), l);
     l->append(", ");
     LogParam(p.last_visit(), l);
     l->append(", ");
     LogParam(p.hidden(), l);
     l->append(")");
   }
 };  // ParamTraits<history::URLRow>
 
-// Traits for ProfileWriter::BookmarkEntry to pack/unpack.
+// Traits for ImportedBookmarkEntry to pack/unpack.
 template <>
-struct ParamTraits<ProfileWriter::BookmarkEntry> {
-  typedef ProfileWriter::BookmarkEntry param_type;
+struct ParamTraits<ImportedBookmarkEntry> {
+  typedef ImportedBookmarkEntry param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.in_toolbar);
     WriteParam(m, p.is_folder);
     WriteParam(m, p.url);
     WriteParam(m, p.path);
     WriteParam(m, p.title);
     WriteParam(m, p.creation_time);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
     return
@@ skipping 12 matching lines @@
     l->append(", ");
     LogParam(p.url, l);
     l->append(", ");
     LogParam(p.path, l);
     l->append(", ");
     LogParam(p.title, l);
     l->append(", ");
     LogParam(p.creation_time, l);
     l->append(")");
   }
-};  // ParamTraits<ProfileWriter::BookmarkEntry>
+};  // ParamTraits<ImportedBookmarkEntry>
 
-// Traits for history::ImportedFaviconUsage.
+// Traits for ImportedFaviconUsage.
 template <>
-struct ParamTraits<history::ImportedFaviconUsage> {
-  typedef history::ImportedFaviconUsage param_type;
+struct ParamTraits<ImportedFaviconUsage> {
+  typedef ImportedFaviconUsage param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.favicon_url);
     WriteParam(m, p.png_data);
     WriteParam(m, p.urls);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
     return
         ReadParam(m, iter, &p->favicon_url) &&
         ReadParam(m, iter, &p->png_data) &&
         ReadParam(m, iter, &p->urls);
   }
   static void Log(const param_type& p, std::string* l) {
     l->append("(");
     LogParam(p.favicon_url, l);
     l->append(", ");
     LogParam(p.png_data, l);
     l->append(", ");
     LogParam(p.urls, l);
     l->append(")");
   }
-};  // ParamTraits<history::ImportedFaviconUsage
+};  // ParamTraits<ImportedFaviconUsage>
 
 // Traits for TemplateURLData
 template <>
 struct ParamTraits<TemplateURLData> {
   typedef TemplateURLData param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.short_name);
     WriteParam(m, p.keyword());
     WriteParam(m, p.url());
     WriteParam(m, p.suggestions_url);
@@ skipping 114 matching lines @@
                           /* To simplify IPC call, pass as an integer */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyHomePageImportReady,
                      GURL  /* GURL of home page */)
 
 IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyBookmarksImportStart,
                      string16  /* first folder name */,
                      int       /* total number of bookmarks */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyBookmarksImportGroup,
-                     std::vector<ProfileWriter::BookmarkEntry>)
+                     std::vector<ImportedBookmarkEntry>)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportStart,
                      int  /* total number of favicons */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportGroup,
-                     std::vector<history::ImportedFaviconUsage>)
+                     std::vector<ImportedFaviconUsage>)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
                      content::PasswordForm)
 
 // WARNING: The TemplateURL*s in the following message get heap-allocated on the
 // receiving end.  The message handler for this message MUST take ownership of
 // these pointers and ensure they're properly freed!
 IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyKeywordsReady,
                      std::vector<TemplateURL*>,
                      bool  /* unique on host and path */)