| Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h
|
| diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h
|
| index 53ebb625cfeb286cd9b34efae45e8c7353882e79..5d2c3d62eb0c7921e6e53e698a5b6ed5b8815bf5 100644
|
| --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h
|
| +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_H_
|
| #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/run_loop.h"
|
| #include "chrome/browser/image_decoder.h"
|
|
|
| @@ -36,7 +37,7 @@ class ImageLoader : public ImageDecoder::ImageRequest {
|
| explicit ImageLoader(const base::FilePath& path);
|
| ~ImageLoader() override;
|
|
|
| - scoped_ptr<gfx::ImageSkia> Load();
|
| + std::unique_ptr<gfx::ImageSkia> Load();
|
|
|
| // ImageDecoder::ImageRequest:
|
| void OnImageDecoded(const SkBitmap& decoded_image) override;
|
| @@ -46,7 +47,7 @@ class ImageLoader : public ImageDecoder::ImageRequest {
|
| base::FilePath path_;
|
| base::RunLoop run_loop_;
|
|
|
| - scoped_ptr<gfx::ImageSkia> decoded_image_;
|
| + std::unique_ptr<gfx::ImageSkia> decoded_image_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ImageLoader);
|
| };
|
|
|