Use SkJpegEncoder in gfx jpeg_codec

components/user_manager/user_image/user_image.cc

 // Copyright 2014 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 "components/user_manager/user_image/user_image.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace user_manager {
 
 namespace {
 
 // Default quality for encoding user images.
 const int kDefaultEncodingQuality = 90;
 
 }  // namespace
 
 // static
 scoped_refptr<base::RefCountedBytes> UserImage::Encode(
     const SkBitmap& bitmap,
     ImageFormat image_format) {
   TRACE_EVENT2("oobe", "UserImage::Encode",
                "width", bitmap.width(), "height", bitmap.height());
   std::vector<unsigned char> output;
-  auto* bitmap_data = reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0));
   if (image_format == FORMAT_JPEG) {
-    if (gfx::JPEGCodec::Encode(
-            bitmap_data,
-            gfx::JPEGCodec::FORMAT_SkBitmap,
-            bitmap.width(),
-            bitmap.height(),
-            bitmap.width() * bitmap.bytesPerPixel(),
-            kDefaultEncodingQuality, &output)) {
+    if (gfx::JPEGCodec::Encode(bitmap, kDefaultEncodingQuality, &output)) {
       return base::RefCountedBytes::TakeVector(&output);
     }
   } else if (image_format == FORMAT_PNG) {
+    auto* bitmap_data =
+        reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0));
     if (gfx::PNGCodec::Encode(
             bitmap_data,
             gfx::PNGCodec::FORMAT_SkBitmap,
             gfx::Size(bitmap.width(), bitmap.height()),
             bitmap.width() * bitmap.bytesPerPixel(),
             false,  // discard_transparency
             std::vector<gfx::PNGCodec::Comment>(), &output)) {
       return base::RefCountedBytes::TakeVector(&output);
     }
   } else {
@@ skipping 40 matching lines @@
       image_format_(image_format) {
 }
 
 UserImage::~UserImage() {}
 
 void UserImage::MarkAsSafe() {
   is_safe_format_ = true;
 }
 
 }  // namespace user_manager