ui/gfx/icon_util_unittest.cc - Issue 529273002: Change base/file_utils.h includes to base/files/file_utils.h in gin, google_apis, printing, sql, ui…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 529273002: Change base/file_utils.h includes to base/files/file_utils.h in gin, google_apis, printing, sql, ui… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 unified diff | Download patch

« ui/gfx/color_profile_win.cc ('K') | « ui/gfx/icon_util.cc ('k') | ui/gfx/test/fontconfig_util_linux.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/file_util.h"	7 #include "base/files/file_util.h"

8 #include "base/files/scoped_temp_dir.h"	8 #include "base/files/scoped_temp_dir.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12 #include "third_party/skia/include/core/SkBitmap.h"	12 #include "third_party/skia/include/core/SkBitmap.h"

13 #include "ui/gfx/gfx_paths.h"	13 #include "ui/gfx/gfx_paths.h"

14 #include "ui/gfx/icon_util_unittests_resource.h"	14 #include "ui/gfx/icon_util_unittests_resource.h"

15 #include "ui/gfx/image/image.h"	15 #include "ui/gfx/image/image.h"

16 #include "ui/gfx/image/image_family.h"	16 #include "ui/gfx/image/image_family.h"

17 #include "ui/gfx/size.h"	17 #include "ui/gfx/size.h"

(...skipping 405 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 }

OLD	NEW