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

Unified Diff: ui/gfx/icon_util_unittest.cc

Issue 2317123003: misc files R-U: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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
« no previous file with comments | « ui/gfx/font_render_params_linux_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/icon_util_unittest.cc
diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc
index 7995427aadbb6f28bddc803de49b30f411a3be8b..0e24c55efbaab03175b6852465717873e3c8e5d8 100644
--- a/ui/gfx/icon_util_unittest.cc
+++ b/ui/gfx/icon_util_unittest.cc
@@ -200,10 +200,10 @@ TEST_F(IconUtilTest, TestBitmapToIconInvalidParameters) {
TEST_F(IconUtilTest, TestCreateIconFileInvalidParameters) {
std::unique_ptr<SkBitmap> bitmap;
gfx::ImageFamily image_family;
- base::FilePath valid_icon_filename = temp_directory_.path().AppendASCII(
- kTempIconFilename);
- base::FilePath invalid_icon_filename = temp_directory_.path().AppendASCII(
- "<>?.ico");
+ base::FilePath valid_icon_filename =
+ temp_directory_.GetPath().AppendASCII(kTempIconFilename);
+ base::FilePath invalid_icon_filename =
+ temp_directory_.GetPath().AppendASCII("<>?.ico");
// Wrong bitmap format.
bitmap.reset(new SkBitmap);
@@ -252,8 +252,8 @@ TEST_F(IconUtilTest, TestCreateIconFileInvalidParameters) {
// This test case makes sure IconUtil::CreateIconFileFromImageFamily fails if
// the image family is empty or invalid.
TEST_F(IconUtilTest, TestCreateIconFileEmptyImageFamily) {
- base::FilePath icon_filename = temp_directory_.path().AppendASCII(
- kTempIconFilename);
+ base::FilePath icon_filename =
+ temp_directory_.GetPath().AppendASCII(kTempIconFilename);
// Empty image family.
EXPECT_FALSE(IconUtil::CreateIconFileFromImageFamily(gfx::ImageFamily(),
@@ -342,7 +342,7 @@ TEST_F(IconUtilTest, TestBasicCreateHICONFromSkBitmap) {
TEST_F(IconUtilTest, TestCreateIconFileFromImageFamily) {
gfx::ImageFamily image_family;
base::FilePath icon_filename =
- temp_directory_.path().AppendASCII(kTempIconFilename);
+ temp_directory_.GetPath().AppendASCII(kTempIconFilename);
// Test with only a 16x16 icon. Should only scale up to 48x48.
image_family.Add(gfx::Image::CreateFrom1xBitmap(
« no previous file with comments | « ui/gfx/font_render_params_linux_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698