Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_ H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_ H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_ H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_ H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/run_loop.h" 13 #include "base/run_loop.h"
13 #include "chrome/browser/image_decoder.h" 14 #include "chrome/browser/image_decoder.h"
14 15
15 class SKBitmap; 16 class SKBitmap;
16 17
17 namespace base { 18 namespace base {
18 class FilePath; 19 class FilePath;
19 } 20 }
20 21
21 namespace gfx { 22 namespace gfx {
22 class ImageSkia; 23 class ImageSkia;
23 } 24 }
24 25
25 namespace chromeos { 26 namespace chromeos {
26 namespace test { 27 namespace test {
27 28
28 extern const char kUserAvatarImage1RelativePath[]; 29 extern const char kUserAvatarImage1RelativePath[];
29 extern const char kUserAvatarImage2RelativePath[]; 30 extern const char kUserAvatarImage2RelativePath[];
30 31
31 // Returns |true| if the two given images are pixel-for-pixel identical. 32 // Returns |true| if the two given images are pixel-for-pixel identical.
32 bool AreImagesEqual(const gfx::ImageSkia& first, const gfx::ImageSkia& second); 33 bool AreImagesEqual(const gfx::ImageSkia& first, const gfx::ImageSkia& second);
33 34
34 class ImageLoader : public ImageDecoder::ImageRequest { 35 class ImageLoader : public ImageDecoder::ImageRequest {
35 public: 36 public:
36 explicit ImageLoader(const base::FilePath& path); 37 explicit ImageLoader(const base::FilePath& path);
37 ~ImageLoader() override; 38 ~ImageLoader() override;
38 39
39 scoped_ptr<gfx::ImageSkia> Load(); 40 std::unique_ptr<gfx::ImageSkia> Load();
40 41
41 // ImageDecoder::ImageRequest: 42 // ImageDecoder::ImageRequest:
42 void OnImageDecoded(const SkBitmap& decoded_image) override; 43 void OnImageDecoded(const SkBitmap& decoded_image) override;
43 void OnDecodeImageFailed() override; 44 void OnDecodeImageFailed() override;
44 45
45 private: 46 private:
46 base::FilePath path_; 47 base::FilePath path_;
47 base::RunLoop run_loop_; 48 base::RunLoop run_loop_;
48 49
49 scoped_ptr<gfx::ImageSkia> decoded_image_; 50 std::unique_ptr<gfx::ImageSkia> decoded_image_;
50 51
51 DISALLOW_COPY_AND_ASSIGN(ImageLoader); 52 DISALLOW_COPY_AND_ASSIGN(ImageLoader);
52 }; 53 };
53 54
54 } // namespace test 55 } // namespace test
55 } // namespace chromeos 56 } // namespace chromeos
56 57
57 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UT IL_H_ 58 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UT IL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698