Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: chrome/utility/importer/safari_importer_unittest.mm

Issue 19251002: move SafariImporter::CanImport to common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/utility/importer/safari_importer.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/safari_importer_unittest.mm
diff --git a/chrome/utility/importer/safari_importer_unittest.mm b/chrome/utility/importer/safari_importer_unittest.mm
index 05392a4f888c0c7db395af24919a2c6e41b619fa..d6c93e20ddc6ec4d8de87bc4fb2d2e054a4df9a3 100644
--- a/chrome/utility/importer/safari_importer_unittest.mm
+++ b/chrome/utility/importer/safari_importer_unittest.mm
@@ -17,6 +17,7 @@
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/common/importer/imported_favicon_usage.h"
#include "chrome/common/importer/importer_bridge.h"
+#include "chrome/common/importer/safari_importer_utils.h"
#include "chrome/utility/importer/safari_importer.h"
#include "sql/connection.h"
#include "testing/platform_test.h"
@@ -187,7 +188,7 @@ TEST_F(SafariImporterTest, FaviconImport) {
TEST_F(SafariImporterTest, CanImport) {
uint16 items = importer::NONE;
- EXPECT_TRUE(SafariImporter::CanImport(GetTestSafariLibraryPath(), &items));
+ EXPECT_TRUE(SafariImporterCanImport(GetTestSafariLibraryPath(), &items));
EXPECT_EQ(items, importer::HISTORY | importer::FAVORITES);
EXPECT_EQ(items & importer::COOKIES, importer::NONE);
EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
@@ -197,5 +198,5 @@ TEST_F(SafariImporterTest, CanImport) {
// Check that we don't import anything from a bogus library directory.
base::ScopedTempDir fake_library_dir;
ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
- EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir.path(), &items));
+ EXPECT_FALSE(SafariImporterCanImport(fake_library_dir.path(), &items));
}
« no previous file with comments | « chrome/utility/importer/safari_importer.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698