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

Side by Side Diff: ui/gfx/icon_util_unittest.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/gfx/icon_util.h" 5 #include "ui/gfx/icon_util.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // The following test case makes sure IconUtil::CreateHICONFromSkBitmap fails 169 // The following test case makes sure IconUtil::CreateHICONFromSkBitmap fails
170 // gracefully when called with invalid input parameters. 170 // gracefully when called with invalid input parameters.
171 TEST_F(IconUtilTest, TestBitmapToIconInvalidParameters) { 171 TEST_F(IconUtilTest, TestBitmapToIconInvalidParameters) {
172 ScopedHICON icon; 172 ScopedHICON icon;
173 scoped_ptr<SkBitmap> bitmap; 173 scoped_ptr<SkBitmap> bitmap;
174 174
175 // Wrong bitmap format. 175 // Wrong bitmap format.
176 bitmap.reset(new SkBitmap); 176 bitmap.reset(new SkBitmap);
177 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL)); 177 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
178 bitmap->setInfo(SkImageInfo::MakeA8(kSmallIconWidth, kSmallIconHeight)); 178 bitmap->setInfo(SkImageInfo::MakeA8(kSmallIconWidth, kSmallIconHeight));
179 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap).Pass(); 179 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
180 EXPECT_FALSE(icon.is_valid()); 180 EXPECT_FALSE(icon.is_valid());
181 181
182 // Invalid bitmap size. 182 // Invalid bitmap size.
183 bitmap.reset(new SkBitmap); 183 bitmap.reset(new SkBitmap);
184 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL)); 184 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
185 bitmap->setInfo(SkImageInfo::MakeN32Premul(0, 0)); 185 bitmap->setInfo(SkImageInfo::MakeN32Premul(0, 0));
186 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap).Pass(); 186 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
187 EXPECT_FALSE(icon.is_valid()); 187 EXPECT_FALSE(icon.is_valid());
188 188
189 // Valid bitmap configuration but no pixels allocated. 189 // Valid bitmap configuration but no pixels allocated.
190 bitmap.reset(new SkBitmap); 190 bitmap.reset(new SkBitmap);
191 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL)); 191 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
192 bitmap->setInfo(SkImageInfo::MakeN32Premul(kSmallIconWidth, 192 bitmap->setInfo(SkImageInfo::MakeN32Premul(kSmallIconWidth,
193 kSmallIconHeight)); 193 kSmallIconHeight));
194 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap).Pass(); 194 icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
195 EXPECT_FALSE(icon.is_valid()); 195 EXPECT_FALSE(icon.is_valid());
196 } 196 }
197 197
198 // The following test case makes sure IconUtil::CreateIconFileFromImageFamily 198 // The following test case makes sure IconUtil::CreateIconFileFromImageFamily
199 // fails gracefully when called with invalid input parameters. 199 // fails gracefully when called with invalid input parameters.
200 TEST_F(IconUtilTest, TestCreateIconFileInvalidParameters) { 200 TEST_F(IconUtilTest, TestCreateIconFileInvalidParameters) {
201 scoped_ptr<SkBitmap> bitmap; 201 scoped_ptr<SkBitmap> bitmap;
202 gfx::ImageFamily image_family; 202 gfx::ImageFamily image_family;
203 base::FilePath valid_icon_filename = temp_directory_.path().AppendASCII( 203 base::FilePath valid_icon_filename = temp_directory_.path().AppendASCII(
204 kTempIconFilename); 204 kTempIconFilename);
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 } 423 }
424 424
425 // This tests that kNumIconDimensionsUpToMediumSize has the correct value. 425 // This tests that kNumIconDimensionsUpToMediumSize has the correct value.
426 TEST_F(IconUtilTest, TestNumIconDimensionsUpToMediumSize) { 426 TEST_F(IconUtilTest, TestNumIconDimensionsUpToMediumSize) {
427 ASSERT_LE(IconUtil::kNumIconDimensionsUpToMediumSize, 427 ASSERT_LE(IconUtil::kNumIconDimensionsUpToMediumSize,
428 IconUtil::kNumIconDimensions); 428 IconUtil::kNumIconDimensions);
429 EXPECT_EQ(IconUtil::kMediumIconSize, 429 EXPECT_EQ(IconUtil::kMediumIconSize,
430 IconUtil::kIconDimensions[ 430 IconUtil::kIconDimensions[
431 IconUtil::kNumIconDimensionsUpToMediumSize - 1]); 431 IconUtil::kNumIconDimensionsUpToMediumSize - 1]);
432 } 432 }
OLDNEW
« no previous file with comments | « ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc ('k') | ui/views/corewm/cursor_height_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698