Move most importer code to chrome/utility/importer

chrome/utility/importer/bookmark_html_reader.cc

Index: chrome/utility/importer/bookmark_html_reader.cc
diff --git a/chrome/browser/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
similarity index 98%
rename from chrome/browser/importer/bookmark_html_reader.cc
rename to chrome/utility/importer/bookmark_html_reader.cc
index 9f41ae71aec38e16cd034c3fcb319066333cf4d5..5d34d7b191a817ce63ad6cf27df6cf68d6a56ce1 100644
--- a/chrome/browser/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.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/bookmark_html_reader.h"
+#include "chrome/utility/importer/bookmark_html_reader.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ -11,9 +11,9 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
-#include "chrome/browser/importer/reencode_favicon.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
+#include "chrome/utility/importer/favicon_reencode.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
@@ -67,8 +67,9 @@ void DataURLToFaviconUsage(
     return;
 
   ImportedFaviconUsage usage;
-  if (!ReencodeFavicon(reinterpret_cast<const uint8*>(&data[0]),
-                       data.size(), &usage.png_data))
+  if (!importer::ReencodeFavicon(
+          reinterpret_cast<const unsigned char*>(&data[0]),
+          data.size(), &usage.png_data))
     return;  // Unable to decode.
 
   // We need to make up a URL for the favicon. We use a version of the page's