Revert "Added support for animated/nonanimated user image. There are no"

chrome/browser/chromeos/login/user_image_screen.cc

 // Copyright (c) 2012 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/chromeos/login/user_image_screen.h"
 
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
-#include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ skipping 80 matching lines @@
   actor_->ShowCameraInitializing();
   camera_controller_.Start();
 }
 
 void UserImageScreen::StopCamera() {
   camera_controller_.Stop();
 }
 
 void UserImageScreen::OnPhotoTaken(const gfx::ImageSkia& image) {
   UserManager* user_manager = UserManager::Get();
-  user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(),
-                              UserImage(image));
+  user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(), image);
 
   get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED);
 
   UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice",
                             kHistogramImageFromCamera,
                             kHistogramImagesCount);
 }
 
 void UserImageScreen::OnProfileImageSelected() {
   UserManager* user_manager = UserManager::Get();
@@ skipping 48 matching lines @@
       if (actor_)
         actor_->OnProfileImageAbsent();
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace chromeos