Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer.mm

Index: chrome/utility/importer/safari_importer.mm
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm
similarity index 98%
rename from chrome/browser/importer/safari_importer.mm
rename to chrome/utility/importer/safari_importer.mm
index 7bb0cd438977d7681a3ab2de94f42e2d6d98e8a4..650c6c5c0ee7d28c2de5dbd72952360588a57357 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/utility/importer/safari_importer.mm
@@ -4,7 +4,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "chrome/browser/importer/safari_importer.h"
+#include "chrome/utility/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ -15,11 +15,11 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/browser/favicon/favicon_util.h"
-#include "chrome/browser/importer/importer_bridge.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/url_constants.h"
+#include "chrome/utility/importer/favicon_reencode.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
 #include "sql/statement.h"
@@ -176,7 +176,7 @@ void SafariImporter::LoadFaviconData(
       if (data.empty())
         continue;  // Data definitely invalid.
 
-      if (!FaviconUtil::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
+      if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;