Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer_unittest.mm

Index: chrome/utility/importer/safari_importer_unittest.mm
diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/utility/importer/safari_importer_unittest.mm
similarity index 95%
rename from chrome/browser/importer/safari_importer_unittest.mm
rename to chrome/utility/importer/safari_importer_unittest.mm
index 93e110c547d943b9afbea5b60c7017293ee92287..d0f46e4560ce5506a041b7a76036946ed252761f 100644
--- a/chrome/browser/importer/safari_importer_unittest.mm
+++ b/chrome/utility/importer/safari_importer_unittest.mm
@@ -2,7 +2,7 @@
 // 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 "chrome/utility/importer/safari_importer.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
@@ -13,10 +13,11 @@
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
 #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 "sql/connection.h"
 #include "testing/platform_test.h"
 
@@ -186,7 +187,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);
@@ -196,5 +197,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));
 }