Many fixes to bookmark importing.

chrome/browser/importer/safari_importer_unittest.mm

 // Copyright (c) 2011 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/safari_importer.h"
 
 #include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
+#include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/platform_test.h"
 
 // In order to test the Safari import functionality effectively, we store a
 // simulated Library directory containing dummy data files in the same
 // structure as ~/Library in the Chrome test data directory.
@@ skipping 46 matching lines @@
   EXPECT_EQ(it2.typed_count(), 0);
   EXPECT_EQ(it2.last_visit().ToDoubleT(),
       importer->HistoryTimeToEpochTime(@"270598231.4"));
 }
 
 TEST_F(SafariImporterTest, BookmarkImport) {
   // Expected results
   const struct {
     bool in_toolbar;
     GURL url;
-    // If the path array for an element is entry set this to true.
-    bool path_is_empty;
-    // We ony support one level of nesting in paths, this makes testing a little
-    // easier.
-    std::wstring path;
-    std::wstring title;
+    // We store the path with levels of nesting delimited by forward slashes.
+    string16 path;
+    string16 title;
   } kImportedBookmarksData[] = {
-    {true, GURL("http://www.apple.com/"), true, L"", L"Apple"},
-    {true, GURL("http://www.yahoo.com/"), true, L"", L"Yahoo!"},
-    {true, GURL("http://www.cnn.com/"), false, L"News", L"CNN"},
-    {true, GURL("http://www.nytimes.com/"), false, L"News",
-        L"The New York Times"},
-    {false, GURL("http://www.reddit.com/"), true, L"",
-        L"reddit.com: what's new online!"},
+    {
+      true,
+      GURL("http://www.apple.com/"),
+      ASCIIToUTF16("Toolbar/"),
+      ASCIIToUTF16("Apple")
+    },
+    {
+      true,
+      GURL("http://www.yahoo.com/"),
+      ASCIIToUTF16("Toolbar/"),
+      ASCIIToUTF16("Yahoo!")
+    },
+    {
+      true,
+      GURL("http://www.cnn.com/"),
+      ASCIIToUTF16("Toolbar/News"),
+      ASCIIToUTF16("CNN")
+    },
+    {
+      true,
+      GURL("http://www.nytimes.com/"),
+      ASCIIToUTF16("Toolbar/News"),
+      ASCIIToUTF16("The New York Times")
+    },
+    {
+      false,
+      GURL("http://www.reddit.com/"),
+      ASCIIToUTF16(""),
+      ASCIIToUTF16("reddit.com: what's new online!")
+    },
+    {
+      false,
+      GURL(),
+      ASCIIToUTF16(""),
+      ASCIIToUTF16("Empty Folder")
+    },
+    {
+      false,
+      GURL("http://www.webkit.org/blog/"),
+      ASCIIToUTF16(""),
+      ASCIIToUTF16("Surfin' Safari - The WebKit Blog")
+    },
   };
 
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
   std::vector<ProfileWriter::BookmarkEntry> bookmarks;
-  importer->ParseBookmarks(&bookmarks);
+  importer->ParseBookmarks(ASCIIToUTF16("Toolbar"), &bookmarks);
   size_t num_bookmarks = bookmarks.size();
-  EXPECT_EQ(num_bookmarks, ARRAYSIZE_UNSAFE(kImportedBookmarksData));
+  ASSERT_EQ(ARRAYSIZE_UNSAFE(kImportedBookmarksData), num_bookmarks);
 
   for (size_t i = 0; i < num_bookmarks; ++i) {
     ProfileWriter::BookmarkEntry& entry = bookmarks[i];
-    EXPECT_EQ(entry.in_toolbar, kImportedBookmarksData[i].in_toolbar);
-    EXPECT_EQ(entry.url, kImportedBookmarksData[i].url);
-    if (kImportedBookmarksData[i].path_is_empty) {
-      EXPECT_EQ(entry.path.size(), 0U);
-    } else {
-      EXPECT_EQ(entry.path.size(), 1U);
-      EXPECT_EQ(UTF16ToWideHack(entry.path[0]), kImportedBookmarksData[i].path);
-      EXPECT_EQ(UTF16ToWideHack(entry.title), kImportedBookmarksData[i].title);
+    EXPECT_EQ(kImportedBookmarksData[i].in_toolbar, entry.in_toolbar);
+    EXPECT_EQ(kImportedBookmarksData[i].url, entry.url);
+
+    std::vector<string16> path;
+    Tokenize(kImportedBookmarksData[i].path, ASCIIToUTF16("/"), &path);
+    ASSERT_EQ(path.size(), entry.path.size());
+    for (size_t j = 0; j < path.size(); ++j) {
+      EXPECT_EQ(path[j], entry.path[j]);
     }
+
+    EXPECT_EQ(kImportedBookmarksData[i].title, entry.title);
   }
 }
 
 TEST_F(SafariImporterTest, FaviconImport) {
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
   sql::Connection db;
   ASSERT_TRUE(importer->OpenDatabase(&db));
 
   SafariImporter::FaviconMap favicon_map;
   importer->ImportFaviconURLs(&db, &favicon_map);
@@ skipping 32 matching lines @@
   EXPECT_EQ(items & importer::COOKIES, importer::NONE);
   EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
   EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);
   EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
 
   // Check that we don't import anything from a bogus library directory.
   ScopedTempDir fake_library_dir;
   ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
   EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir.path(), &items));
 }