Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer.h

Index: chrome/utility/importer/safari_importer.h
diff --git a/chrome/browser/importer/safari_importer.h b/chrome/utility/importer/safari_importer.h
similarity index 82%
rename from chrome/browser/importer/safari_importer.h
rename to chrome/utility/importer/safari_importer.h
index fd83083a2040b00d2fa03675d88e14480227643f..8b346d27859296a7a6642a5a4f79aeecdf72b27f 100644
--- a/chrome/browser/importer/safari_importer.h
+++ b/chrome/utility/importer/safari_importer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
-#define CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
+#ifndef CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
+#define CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
 
 #include <map>
 #include <set>
@@ -13,9 +13,8 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/importer.h"
 #include "chrome/common/importer/importer_url_row.h"
+#include "chrome/utility/importer/importer.h"
 
 #if __OBJC__
 @class NSDictionary;
@@ -29,10 +28,6 @@ class GURL;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
 
-namespace history {
-class URLRow;
-}
-
 namespace sql {
 class Connection;
 }
@@ -49,13 +44,13 @@ class SafariImporter : public Importer {
                            uint16 items,
                            ImporterBridge* bridge) OVERRIDE;
 
- // Does this user account have a Safari Profile and if so, what items
- // are supported?
- // in: library_dir - ~/Library or a standin for testing purposes.
- // out: services_supported - the service supported for import.
- // Returns true if we can import the Safari profile.
- static bool CanImport(const base::FilePath& library_dir,
-                       uint16* services_supported);
+  // Does this user account have a Safari Profile and if so, what items
+  // are supported?
+  // in: library_dir - ~/Library or a standin for testing purposes.
+  // out: services_supported - the service supported for import.
+  // Returns true if we can import the Safari profile.
+  static bool CanImport(const base::FilePath& library_dir,
+                        uint16* services_supported);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport);
@@ -112,4 +107,4 @@ class SafariImporter : public Importer {
   DISALLOW_COPY_AND_ASSIGN(SafariImporter);
 };
 
-#endif  // CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
+#endif  // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_