Move image_decoder.cc/.h from webkit\glue to content\child.

chrome/common/extensions/manifest_handlers/icons_handler.cc

 // Copyright (c) 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/common/extensions/manifest_handlers/icons_handler.h"
 
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_handler_helpers.h"
+#include "content/public/child/image_decoder_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/glue/image_decoder.h"
+#include "ui/gfx/size.h"
 
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 static base::LazyInstance<ExtensionIconSet> g_empty_icon_set =
     LAZY_INSTANCE_INITIALIZER;
 
 const int IconsInfo::kPageActionIconMaxSize = 19;
 const int IconsInfo::kBrowserActionIconMaxSize = 19;
@@ skipping 32 matching lines @@
 
   std::string file_contents;
   if (!file_util::ReadFileToString(icon_path, &file_contents)) {
     DLOG(ERROR) << "Could not read icon file: " << icon_path.LossyDisplayName();
     return;
   }
 
   // Decode the image using WebKit's image decoder.
   const unsigned char* data =
     reinterpret_cast<const unsigned char*>(file_contents.data());
-  webkit_glue::ImageDecoder decoder;
   scoped_ptr<SkBitmap> decoded(new SkBitmap());
-  *decoded = decoder.Decode(data, file_contents.length());
+  *decoded = content::DecodeImage(data, gfx::Size(), file_contents.length());
   if (decoded->empty()) {
     DLOG(ERROR) << "Could not decode icon file: "
                 << icon_path.LossyDisplayName();
     return;
   }
 
   if (decoded->width() != icon_size || decoded->height() != icon_size) {
     DLOG(ERROR) << "Icon file has unexpected size: "
                 << base::IntToString(decoded->width()) << "x"
                 << base::IntToString(decoded->height());
@@ skipping 67 matching lines @@
       extension,
       IDS_EXTENSION_LOAD_ICON_FAILED,
       error);
 }
 
 const std::vector<std::string> IconsHandler::Keys() const {
   return SingleKey(keys::kIcons);
 }
 
 }  // namespace extensions