Move most importer code to chrome/utility/importer

chrome/utility/importer/ie_importer.cc

Index: chrome/utility/importer/ie_importer.cc
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/utility/importer/ie_importer.cc
similarity index 98%
rename from chrome/browser/importer/ie_importer.cc
rename to chrome/utility/importer/ie_importer.cc
index 6b498cf0ece2542cf6f9f9f32693fb7c0982c22f..302a93deb006ef15b25a9980ce09d793f78c72dd 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/utility/importer/ie_importer.cc
@@ -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/ie_importer.h"
+#include "chrome/utility/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
@@ -29,16 +29,16 @@
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
-#include "chrome/browser/favicon/favicon_util.h"
-#include "chrome/browser/importer/ie_importer_utils_win.h"
-#include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/pstore_declarations.h"
+#include "chrome/common/importer/ie_importer_utils_win.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/importer_data_types.h"
 #include "chrome/common/importer/importer_url_row.h"
+#include "chrome/common/importer/pstore_declarations.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/utility/importer/favicon_reencode.h"
 #include "content/public/common/password_form.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -362,7 +362,7 @@ bool ReadReencodedFaviconData(const string16& file,
 
   const unsigned char* ptr =
       reinterpret_cast<const unsigned char*>(image_data.c_str());
-  return FaviconUtil::ReencodeFavicon(ptr, image_data.size(), data);
+  return importer::ReencodeFavicon(ptr, image_data.size(), data);
 }
 
 // Loads favicon image data and registers to |favicon_map|.
@@ -522,7 +522,7 @@ void IEImporter::ImportHistory() {
     }
 
     if (!rows.empty() && !cancelled()) {
-      bridge_->SetHistoryItems(rows, history::SOURCE_IE_IMPORTED);
+      bridge_->SetHistoryItems(rows, IMPORTER_VISIT_SOURCE_IE_IMPORTED);
     }
   }
 }