Move most importer code to chrome/utility/importer

chrome/utility/importer/bookmark_html_reader.cc

 // Copyright 2013 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/bookmark_html_reader.h"
+#include "chrome/utility/importer/bookmark_html_reader.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #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"
 #include "url/gurl.h"
 
 namespace {
 
 // Fetches the given |attribute| value from the |attribute_list|. Returns true
 // if successful, and |value| will contain the value.
 bool GetAttribute(const std::string& attribute_list,
@@ skipping 33 matching lines @@
       !favicon_data.SchemeIs(chrome::kDataScheme))
     return;
 
   // Parse the data URL.
   std::string mime_type, char_set, data;
   if (!net::DataURL::Parse(favicon_data, &mime_type, &char_set, &data) ||
       data.empty())
     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
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
@@ skipping 340 matching lines @@
       *url = GURL(value);
     }
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace bookmark_html_reader