Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/importer_util.cc

Index: chrome/browser/importer/importer_util.cc
diff --git a/chrome/browser/importer/importer_util.cc b/chrome/browser/importer/importer_util.cc
deleted file mode 100644
index c0eea4aab23528d55544866fdf17268cc20ce878..0000000000000000000000000000000000000000
--- a/chrome/browser/importer/importer_util.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2011 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/importer_util.h"
-
-#include "skia/ext/image_operations.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/favicon_size.h"
-#include "webkit/glue/image_decoder.h"
-
-namespace importer {
-
-bool ReencodeFavicon(const unsigned char* src_data,
-                     size_t src_len,
-                     std::vector<unsigned char>* png_data) {
-  // Decode the favicon using WebKit's image decoder.
-  webkit_glue::ImageDecoder decoder(
-      gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
-  SkBitmap decoded = decoder.Decode(src_data, src_len);
-  if (decoded.empty())
-    return false;  // Unable to decode.
-
-  if (decoded.width() != gfx::kFaviconSize ||
-      decoded.height() != gfx::kFaviconSize) {
-    // The bitmap is not the correct size, re-sample.
-    int new_width = decoded.width();
-    int new_height = decoded.height();
-    gfx::CalculateFaviconTargetSize(&new_width, &new_height);
-    decoded = skia::ImageOperations::Resize(
-        decoded, skia::ImageOperations::RESIZE_LANCZOS3, new_width, new_height);
-  }
-
-  // Encode our bitmap as a PNG.
-  gfx::PNGCodec::EncodeBGRASkBitmap(decoded, false, png_data);
-  return true;
-}
-
-}  // namespace importer