Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/toolbar_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/toolbar_importer.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
@@ skipping 238 matching lines @@
   if (cancelled()) {
     EndImport();
     return;
   }
 
   state_ = PARSE_BOOKMARKS;
 
   XmlReader reader;
   if (reader.Load(response) && !cancelled()) {
     // Construct Bookmarks
-    std::vector<ProfileWriter::BookmarkEntry> bookmarks;
+    std::vector<ImportedBookmarkEntry> bookmarks;
     if (ParseBookmarksFromReader(&reader, &bookmarks,
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR)))
       AddBookmarksToChrome(bookmarks);
   }
   EndImportBookmarks();
 }
 
 bool Toolbar5Importer::ParseAuthenticationTokenResponse(
     const std::string& response,
     std::string* token) {
   DCHECK(token);
 
   *token = response;
   size_t position = token->find(kAuthorizationTokenPrefix);
   if (0 != position)
     return false;
   token->replace(position, arraysize(kAuthorizationTokenPrefix) - 1, "");
 
   position = token->find(kAuthorizationTokenSuffix);
   if (token->size() != (position + (arraysize(kAuthorizationTokenSuffix) - 1)))
     return false;
   token->replace(position, arraysize(kAuthorizationTokenSuffix) - 1, "");
 
   return true;
 }
 
 // Parsing
 bool Toolbar5Importer::ParseBookmarksFromReader(
     XmlReader* reader,
-    std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+    std::vector<ImportedBookmarkEntry>* bookmarks,
     const string16& bookmark_group_string) {
   DCHECK(reader);
   DCHECK(bookmarks);
 
   // The XML blob returned from the server is described in the
   // Toolbar-Notebook/Bookmarks Protocol document located at
   // https://docs.google.com/a/google.com/Doc?docid=cgt3m7dr_24djt62m&hl=en
   // We are searching for the section with structure
   // <bookmarks><bookmark>...</bookmark><bookmark>...</bookmark></bookmarks>
 
   // Locate the |bookmarks| blob.
   if (!reader->SkipToElement())
     return false;
 
   if (!LocateNextTagByName(reader, kBookmarksXmlTag))
     return false;
 
   // Parse each |bookmark| blob
   while (LocateNextTagWithStopByName(reader, kBookmarkXmlTag,
                                      kBookmarksXmlTag)) {
-    ProfileWriter::BookmarkEntry bookmark_entry;
+    ImportedBookmarkEntry bookmark_entry;
     std::vector<BookmarkFolderType> folders;
     if (ExtractBookmarkInformation(reader, &bookmark_entry, &folders,
                                    bookmark_group_string)) {
       // For each folder we create a new bookmark entry.  Duplicates will
       // be detected when we attempt to create the bookmark in the profile.
       for (std::vector<BookmarkFolderType>::iterator folder = folders.begin();
           folder != folders.end();
           ++folder) {
         bookmark_entry.path = *folder;
         bookmarks->push_back(bookmark_entry);
@@ skipping 42 matching lines @@
       return false;
     // If we encounter the stop word return false.
     if (stop == reader->NodeName())
       return false;
   }
   return true;
 }
 
 bool Toolbar5Importer::ExtractBookmarkInformation(
     XmlReader* reader,
-    ProfileWriter::BookmarkEntry* bookmark_entry,
+    ImportedBookmarkEntry* bookmark_entry,
     std::vector<BookmarkFolderType>* bookmark_folders,
     const string16& bookmark_group_string) {
   DCHECK(reader);
   DCHECK(bookmark_entry);
   DCHECK(bookmark_folders);
 
   // The following is a typical bookmark entry.
   // The reader should be pointing to the <title> tag at the moment.
   //
   // <bookmark>
@@ skipping 52 matching lines @@
 
   if (name != reader->NodeName())
     return false;
   if (!reader->ReadElementContent(buffer))
     return false;
   return true;
 }
 
 bool Toolbar5Importer::ExtractTitleFromXmlReader(
     XmlReader* reader,
-    ProfileWriter::BookmarkEntry* entry) {
+    ImportedBookmarkEntry* entry) {
   DCHECK(reader);
   DCHECK(entry);
 
   if (!LocateNextTagWithStopByName(reader, kTitleXmlTag, kUrlXmlTag))
     return false;
   std::string buffer;
   if (!ExtractNamedValueFromXmlReader(reader, kTitleXmlTag, &buffer)) {
     return false;
   }
   entry->title = UTF8ToUTF16(buffer);
   return true;
 }
 
 bool Toolbar5Importer::ExtractUrlFromXmlReader(
     XmlReader* reader,
-    ProfileWriter::BookmarkEntry* entry) {
+    ImportedBookmarkEntry* entry) {
   DCHECK(reader);
   DCHECK(entry);
 
   if (!LocateNextTagWithStopByName(reader, kUrlXmlTag, kTimestampXmlTag))
     return false;
   std::string buffer;
   if (!ExtractNamedValueFromXmlReader(reader, kUrlXmlTag, &buffer)) {
     return false;
   }
   entry->url = GURL(buffer);
   return true;
 }
 
 bool Toolbar5Importer::ExtractTimeFromXmlReader(
     XmlReader* reader,
-    ProfileWriter::BookmarkEntry* entry) {
+    ImportedBookmarkEntry* entry) {
   DCHECK(reader);
   DCHECK(entry);
   if (!LocateNextTagWithStopByName(reader, kTimestampXmlTag, kLabelsXmlTag))
     return false;
   std::string buffer;
   if (!ExtractNamedValueFromXmlReader(reader, kTimestampXmlTag, &buffer)) {
     return false;
   }
   int64 timestamp;
   if (!base::StringToInt64(buffer, &timestamp)) {
@@ skipping 54 matching lines @@
     std::vector<string16> folder_names;
     base::SplitString(label_vector[index], ':', &folder_names);
     (*bookmark_folders)[index].insert((*bookmark_folders)[index].end(),
         folder_names.begin(), folder_names.end());
   }
 
   return true;
 }
 
 void  Toolbar5Importer::AddBookmarksToChrome(
-    const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
+    const std::vector<ImportedBookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
     const string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
 }