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

Side by Side Diff: ios/chrome/browser/favicon/large_icon_cache_unittest.cc

Issue 1861593005: Convert //ios 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "ios/chrome/browser/favicon/large_icon_cache.h" 5 #include "ios/chrome/browser/favicon/large_icon_cache.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "components/favicon_base/fallback_icon_style.h" 8 #include "components/favicon_base/fallback_icon_style.h"
9 #include "components/favicon_base/favicon_types.h" 9 #include "components/favicon_base/favicon_types.h"
10 #include "skia/ext/skia_utils_ios.h" 10 #include "skia/ext/skia_utils_ios.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 LargeIconCacheTest() { 43 LargeIconCacheTest() {
44 expected_fallback_icon_style_.reset(new favicon_base::FallbackIconStyle()); 44 expected_fallback_icon_style_.reset(new favicon_base::FallbackIconStyle());
45 expected_fallback_icon_style_->background_color = kTestColor; 45 expected_fallback_icon_style_->background_color = kTestColor;
46 expected_bitmap_ = CreateTestBitmap(24, 24, kTestColor); 46 expected_bitmap_ = CreateTestBitmap(24, 24, kTestColor);
47 large_icon_cache_.reset(new LargeIconCache); 47 large_icon_cache_.reset(new LargeIconCache);
48 } 48 }
49 49
50 ~LargeIconCacheTest() override {} 50 ~LargeIconCacheTest() override {}
51 51
52 protected: 52 protected:
53 scoped_ptr<LargeIconCache> large_icon_cache_; 53 std::unique_ptr<LargeIconCache> large_icon_cache_;
54 favicon_base::FaviconRawBitmapResult expected_bitmap_; 54 favicon_base::FaviconRawBitmapResult expected_bitmap_;
55 scoped_ptr<favicon_base::FallbackIconStyle> expected_fallback_icon_style_; 55 std::unique_ptr<favicon_base::FallbackIconStyle>
56 expected_fallback_icon_style_;
56 57
57 bool is_callback_invoked_; 58 bool is_callback_invoked_;
58 59
59 private: 60 private:
60 DISALLOW_COPY_AND_ASSIGN(LargeIconCacheTest); 61 DISALLOW_COPY_AND_ASSIGN(LargeIconCacheTest);
61 }; 62 };
62 63
63 TEST_F(LargeIconCacheTest, EmptyCache) { 64 TEST_F(LargeIconCacheTest, EmptyCache) {
64 scoped_ptr<LargeIconCache> large_icon_cache(new LargeIconCache); 65 std::unique_ptr<LargeIconCache> large_icon_cache(new LargeIconCache);
65 EXPECT_EQ(nullptr, large_icon_cache->GetCachedResult(GURL(kDummyUrl))); 66 EXPECT_EQ(nullptr, large_icon_cache->GetCachedResult(GURL(kDummyUrl)));
66 } 67 }
67 68
68 TEST_F(LargeIconCacheTest, RetreiveItem) { 69 TEST_F(LargeIconCacheTest, RetreiveItem) {
69 scoped_ptr<favicon_base::LargeIconResult> expected_result1; 70 std::unique_ptr<favicon_base::LargeIconResult> expected_result1;
70 scoped_ptr<favicon_base::LargeIconResult> expected_result2; 71 std::unique_ptr<favicon_base::LargeIconResult> expected_result2;
71 expected_result1.reset(new favicon_base::LargeIconResult(expected_bitmap_)); 72 expected_result1.reset(new favicon_base::LargeIconResult(expected_bitmap_));
72 expected_result2.reset(new favicon_base::LargeIconResult( 73 expected_result2.reset(new favicon_base::LargeIconResult(
73 new favicon_base::FallbackIconStyle(*expected_fallback_icon_style_))); 74 new favicon_base::FallbackIconStyle(*expected_fallback_icon_style_)));
74 75
75 large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result1); 76 large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result1);
76 large_icon_cache_->SetCachedResult(GURL(kDummyUrl2), *expected_result2); 77 large_icon_cache_->SetCachedResult(GURL(kDummyUrl2), *expected_result2);
77 78
78 scoped_ptr<favicon_base::LargeIconResult> result1 = 79 std::unique_ptr<favicon_base::LargeIconResult> result1 =
79 large_icon_cache_->GetCachedResult(GURL(kDummyUrl)); 80 large_icon_cache_->GetCachedResult(GURL(kDummyUrl));
80 EXPECT_EQ(true, result1->bitmap.is_valid()); 81 EXPECT_EQ(true, result1->bitmap.is_valid());
81 EXPECT_EQ(expected_result1->bitmap.pixel_size, result1->bitmap.pixel_size); 82 EXPECT_EQ(expected_result1->bitmap.pixel_size, result1->bitmap.pixel_size);
82 83
83 scoped_ptr<favicon_base::LargeIconResult> result2 = 84 std::unique_ptr<favicon_base::LargeIconResult> result2 =
84 large_icon_cache_->GetCachedResult(GURL(kDummyUrl2)); 85 large_icon_cache_->GetCachedResult(GURL(kDummyUrl2));
85 EXPECT_EQ(false, result2->bitmap.is_valid()); 86 EXPECT_EQ(false, result2->bitmap.is_valid());
86 EXPECT_EQ(expected_result2->fallback_icon_style->background_color, 87 EXPECT_EQ(expected_result2->fallback_icon_style->background_color,
87 result2->fallback_icon_style->background_color); 88 result2->fallback_icon_style->background_color);
88 89
89 // Test overwriting kDummyUrl. 90 // Test overwriting kDummyUrl.
90 large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result2); 91 large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result2);
91 scoped_ptr<favicon_base::LargeIconResult> result3 = 92 std::unique_ptr<favicon_base::LargeIconResult> result3 =
92 large_icon_cache_->GetCachedResult(GURL(kDummyUrl2)); 93 large_icon_cache_->GetCachedResult(GURL(kDummyUrl2));
93 EXPECT_EQ(false, result3->bitmap.is_valid()); 94 EXPECT_EQ(false, result3->bitmap.is_valid());
94 EXPECT_EQ(expected_result2->fallback_icon_style->background_color, 95 EXPECT_EQ(expected_result2->fallback_icon_style->background_color,
95 result3->fallback_icon_style->background_color); 96 result3->fallback_icon_style->background_color);
96 } 97 }
97 98
98 } // namespace 99 } // namespace
OLDNEW
« no previous file with comments | « ios/chrome/browser/favicon/large_icon_cache.cc ('k') | ios/chrome/browser/find_in_page/find_in_page_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698