Move UserImage to user_manager

components/user_manager/avatar/user_image.h

 // 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_H_
+#ifndef COMPONENTS_USER_MANAGER_AVATAR_USER_IMAGE_H_
+#define COMPONENTS_USER_MANAGER_AVATAR_USER_IMAGE_H_
 
 #include <string>
 #include <vector>
 
+#include "components/user_manager/user_manager_export.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"

[blundell, 2014/07/09 14:22:22]

you should also have a url dependency.

[Nikita (slow), 2014/07/09 14:44:37]

Done.

 
-namespace chromeos {
+namespace user_manager {
 
 // Wrapper class storing a still image and it's raw representation.  Could be
 // used for storing profile images (including animated profile images) and user
 // wallpapers.
-class UserImage {
+class USER_MANAGER_EXPORT UserImage {
  public:
   // TODO(ivankr): replace with RefCountedMemory to prevent copying.
   typedef std::vector<unsigned char> RawImage;
 
   // Creates a new instance from a given still frame and tries to encode raw
   // representation for it.
   // TODO(ivankr): remove eventually.
   static UserImage CreateAndEncode(const gfx::ImageSkia& image);
 
   // Create instance with an empty still frame and no raw data.
@@ skipping 41 matching lines @@
   RawImage raw_image_;
   bool has_animated_image_;
   RawImage animated_image_;
   GURL url_;
 
   // If image was loaded from the local file, file path is stored here.
   std::string file_path_;
   bool is_safe_format_;
 };
 
-}  // namespace chromeos
+}  // namespace user_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_H_
+#endif  // COMPONENTS_USER_MANAGER_AVATAR_USER_IMAGE_H_