Revert of Clean up. Experimental user avatars removed.

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/debug/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
 namespace user_manager {
 
 namespace {
 
 // Default quality for encoding user images.
 const int kDefaultEncodingQuality = 90;
 
+bool IsAnimatedImage(const UserImage::RawImage& data) {
+  const char kGIFStamp[] = "GIF";
+  const size_t kGIFStampLength = sizeof(kGIFStamp) - 1;
+
+  if (data.size() >= kGIFStampLength &&
+      memcmp(&data[0], kGIFStamp, kGIFStampLength) == 0) {
+    return true;
+  }
+  return false;
+}
+
 bool EncodeImageSkia(const gfx::ImageSkia& image,
                      std::vector<unsigned char>* output) {
   TRACE_EVENT2("oobe", "EncodeImageSkia",
                "width", image.width(), "height", image.height());
   if (image.isNull())
     return false;
   const SkBitmap& bitmap = *image.bitmap();
   SkAutoLockPixels lock_image(bitmap);
   return gfx::JPEGCodec::Encode(
       reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
@@ skipping 12 matching lines @@
   if (EncodeImageSkia(image, &raw_image)) {
     UserImage result(image, raw_image);
     result.MarkAsSafe();
     return result;
   }
   return UserImage(image);
 }
 
 UserImage::UserImage()
     : has_raw_image_(false),
+      has_animated_image_(false),
       is_safe_format_(false) {
 }
 
 UserImage::UserImage(const gfx::ImageSkia& image)
     : image_(image),
       has_raw_image_(false),
+      has_animated_image_(false),
       is_safe_format_(false) {
 }
 
 UserImage::UserImage(const gfx::ImageSkia& image,
                      const RawImage& raw_image)
     : image_(image),
       has_raw_image_(false),
+      has_animated_image_(false),
       is_safe_format_(false) {
-  has_raw_image_ = true;
-  raw_image_ = raw_image;
+  if (IsAnimatedImage(raw_image)) {
+    has_animated_image_ = true;
+    animated_image_ = raw_image;
+    if (EncodeImageSkia(image_, &raw_image_)) {
+      has_raw_image_ = true;
+      MarkAsSafe();
+    }
+  } else {
+    has_raw_image_ = true;
+    raw_image_ = raw_image;
+  }
 }
 
 UserImage::~UserImage() {}
 
 void UserImage::DiscardRawImage() {
   RawImage().swap(raw_image_);  // Clear |raw_image_|.
 }
 
 void UserImage::MarkAsSafe() {
   is_safe_format_ = true;
 }
 
 }  // namespace user_manager