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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/favicon/large_icon_cache_unittest.cc
diff --git a/ios/chrome/browser/favicon/large_icon_cache_unittest.cc b/ios/chrome/browser/favicon/large_icon_cache_unittest.cc
index 29d2be37ab93b7c1b56f1592e0e0eb228d7deb7b..020c442ec7ad9c2e72fe8fe092692d6a14c98ff3 100644
--- a/ios/chrome/browser/favicon/large_icon_cache_unittest.cc
+++ b/ios/chrome/browser/favicon/large_icon_cache_unittest.cc
@@ -50,9 +50,10 @@ class LargeIconCacheTest : public testing::Test {
~LargeIconCacheTest() override {}
protected:
- scoped_ptr<LargeIconCache> large_icon_cache_;
+ std::unique_ptr<LargeIconCache> large_icon_cache_;
favicon_base::FaviconRawBitmapResult expected_bitmap_;
- scoped_ptr<favicon_base::FallbackIconStyle> expected_fallback_icon_style_;
+ std::unique_ptr<favicon_base::FallbackIconStyle>
+ expected_fallback_icon_style_;
bool is_callback_invoked_;
@@ -61,13 +62,13 @@ class LargeIconCacheTest : public testing::Test {
};
TEST_F(LargeIconCacheTest, EmptyCache) {
- scoped_ptr<LargeIconCache> large_icon_cache(new LargeIconCache);
+ std::unique_ptr<LargeIconCache> large_icon_cache(new LargeIconCache);
EXPECT_EQ(nullptr, large_icon_cache->GetCachedResult(GURL(kDummyUrl)));
}
TEST_F(LargeIconCacheTest, RetreiveItem) {
- scoped_ptr<favicon_base::LargeIconResult> expected_result1;
- scoped_ptr<favicon_base::LargeIconResult> expected_result2;
+ std::unique_ptr<favicon_base::LargeIconResult> expected_result1;
+ std::unique_ptr<favicon_base::LargeIconResult> expected_result2;
expected_result1.reset(new favicon_base::LargeIconResult(expected_bitmap_));
expected_result2.reset(new favicon_base::LargeIconResult(
new favicon_base::FallbackIconStyle(*expected_fallback_icon_style_)));
@@ -75,12 +76,12 @@ TEST_F(LargeIconCacheTest, RetreiveItem) {
large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result1);
large_icon_cache_->SetCachedResult(GURL(kDummyUrl2), *expected_result2);
- scoped_ptr<favicon_base::LargeIconResult> result1 =
+ std::unique_ptr<favicon_base::LargeIconResult> result1 =
large_icon_cache_->GetCachedResult(GURL(kDummyUrl));
EXPECT_EQ(true, result1->bitmap.is_valid());
EXPECT_EQ(expected_result1->bitmap.pixel_size, result1->bitmap.pixel_size);
- scoped_ptr<favicon_base::LargeIconResult> result2 =
+ std::unique_ptr<favicon_base::LargeIconResult> result2 =
large_icon_cache_->GetCachedResult(GURL(kDummyUrl2));
EXPECT_EQ(false, result2->bitmap.is_valid());
EXPECT_EQ(expected_result2->fallback_icon_style->background_color,
@@ -88,7 +89,7 @@ TEST_F(LargeIconCacheTest, RetreiveItem) {
// Test overwriting kDummyUrl.
large_icon_cache_->SetCachedResult(GURL(kDummyUrl), *expected_result2);
- scoped_ptr<favicon_base::LargeIconResult> result3 =
+ std::unique_ptr<favicon_base::LargeIconResult> result3 =
large_icon_cache_->GetCachedResult(GURL(kDummyUrl2));
EXPECT_EQ(false, result3->bitmap.is_valid());
EXPECT_EQ(expected_result2->fallback_icon_style->background_color,
« 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