Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer_unittest.mm

 // 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/safari_importer.h"
+#include "chrome/utility/importer/safari_importer.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #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"

[gab, 2013/07/09 20:48:31]

It seems you reverted some, but not all changes involving your new
chrome/common/importer/safari_importer_utils.h

Does this actually need to go in chrome/common? If so you'll need to do this as
a precursor CL, not a follow-up CL, right?

[scottmg, 2013/07/09 21:16:45]

Done.
Which "this"?

safari_importer_unittest.mm seems to belong with safari_importer.mm. 

safari_importer_utils.h has to go in common because it's used from
importer_list.

I made the DEPS temporarily ! instead of - for browser so that I could split it
up per previous request.

[gab, 2013/07/09 21:29:43]

Ok, my question was, are you planning to introduce
"chrome/common/importer/safari_importer_utils.h" in a CL before or after this
one?

 #include "sql/connection.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.
 // This function returns the path to that directory.
 base::FilePath GetTestSafariLibraryPath() {
   base::FilePath test_dir;
   PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
@@ skipping 149 matching lines @@
   EXPECT_TRUE(fav1.urls.find(GURL("http://www.opensearch.org/Home"))
       != fav1.urls.end());
 
   EXPECT_TRUE(fav1.urls.find(
       GURL("http://www.opensearch.org/Special:Search?search=lalala&go=Search"))
           != fav1.urls.end());
 }
 
 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);
   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.
   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));
 }