Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/toolbar_importer_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_util.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/first_run/first_run_internal.h"
 #include "chrome/browser/importer/toolbar_importer.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 // See http://crbug.com/11838
 TEST(Toolbar5ImporterTest, BookmarkParse) {
 static const string16 kTitle = ASCIIToUTF16("MyTitle");
 static const char kUrl[] = "http://www.google.com/";
@@ skipping 286 matching lines @@
     "<name>favicon_timestamp</name> <value>1153328653</value> "
     "</attribute> "
     "<attribute> <name>notebook_name</name> <value>My notebook 0</value> "
     "</attribute> "
     "<attribute> <name>section_name</name> <value>My section 0 "
     "</value> </attribute> </attributes> "
     "</bookmark> </bookmarks>";
 
   XmlReader reader;
   std::string bookmark_xml;
-  std::vector<ProfileWriter::BookmarkEntry> bookmarks;
+  std::vector<ImportedBookmarkEntry> bookmarks;
 
   const GURL url(kUrl);
   const GURL other_url(kOtherUrl);
 
   // Test doesn't work if the importer thinks this is the first run of Chromium.
   // Mark this as a subsequent run of the browser.
   first_run::internal::first_run_ = first_run::internal::FIRST_RUN_FALSE;
 
   // Test case 1 is parsing a basic bookmark with a single label.
   bookmark_xml = kGoodBookmark;
@@ skipping 148 matching lines @@
       &bookmarks, kBookmarkGroupTitle));
 
   // Test case 13 tests when a bookmark has no <labels> section.
   bookmark_xml = kBadBookmarkNoLabels;
   bookmarks.clear();
   XmlReader reader13;
   EXPECT_TRUE(reader13.Load(bookmark_xml));
   EXPECT_FALSE(Toolbar5Importer::ParseBookmarksFromReader(&reader13,
       &bookmarks, kBookmarkGroupTitle));
 }