base/mac/mac_util_unittest.mm - Issue 1917973002: mac: Remove IsOSLion().

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

Unified Diff: base/mac/mac_util_unittest.mm

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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: base/mac/mac_util_unittest.mm

diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm

index eac627ed82fd2c8eb60144520dc3ad14d6e00114..bed39f4a27f6bfc64b23c18bb251b33e4f4b379d 100644

--- a/base/mac/mac_util_unittest.mm

+++ b/base/mac/mac_util_unittest.mm

@@ -145,26 +145,7 @@ TEST_F(MacUtilTest, IsOSEllipsis) {

base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);

if (major == 10) {

- if (minor == 7) {

- EXPECT_TRUE(IsOSLion());

- EXPECT_TRUE(IsOSLionOrEarlier());

- EXPECT_TRUE(IsOSLionOrLater());

- EXPECT_FALSE(IsOSMountainLion());

- EXPECT_TRUE(IsOSMountainLionOrEarlier());

- EXPECT_FALSE(IsOSMountainLionOrLater());

- EXPECT_FALSE(IsOSMavericks());

- EXPECT_TRUE(IsOSMavericksOrEarlier());

- EXPECT_FALSE(IsOSMavericksOrLater());

- EXPECT_FALSE(IsOSYosemite());

- EXPECT_TRUE(IsOSYosemiteOrEarlier());

- EXPECT_FALSE(IsOSYosemiteOrLater());

- EXPECT_FALSE(IsOSElCapitan());

- EXPECT_FALSE(IsOSElCapitanOrLater());

- EXPECT_FALSE(IsOSLaterThanElCapitan_DontCallThis());

- } else if (minor == 8) {

- EXPECT_FALSE(IsOSLion());

- EXPECT_FALSE(IsOSLionOrEarlier());

- EXPECT_TRUE(IsOSLionOrLater());

+ if (minor == 8) {

EXPECT_TRUE(IsOSMountainLion());

EXPECT_TRUE(IsOSMountainLionOrEarlier());

EXPECT_TRUE(IsOSMountainLionOrLater());

@@ -178,9 +159,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {

EXPECT_FALSE(IsOSElCapitanOrLater());

EXPECT_FALSE(IsOSLaterThanElCapitan_DontCallThis());

} else if (minor == 9) {

- EXPECT_FALSE(IsOSLion());

- EXPECT_FALSE(IsOSLionOrEarlier());

- EXPECT_TRUE(IsOSLionOrLater());

EXPECT_FALSE(IsOSMountainLion());

EXPECT_FALSE(IsOSMountainLionOrEarlier());

EXPECT_TRUE(IsOSMountainLionOrLater());

@@ -194,9 +172,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {

EXPECT_FALSE(IsOSElCapitanOrLater());

EXPECT_FALSE(IsOSLaterThanElCapitan_DontCallThis());

} else if (minor == 10) {

- EXPECT_FALSE(IsOSLion());

- EXPECT_FALSE(IsOSLionOrEarlier());

- EXPECT_TRUE(IsOSLionOrLater());

EXPECT_FALSE(IsOSMountainLion());

EXPECT_FALSE(IsOSMountainLionOrEarlier());

EXPECT_TRUE(IsOSMountainLionOrLater());

@@ -210,9 +185,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {

EXPECT_FALSE(IsOSElCapitanOrLater());

EXPECT_FALSE(IsOSLaterThanElCapitan_DontCallThis());

} else if (minor == 11) {

- EXPECT_FALSE(IsOSLion());

- EXPECT_FALSE(IsOSLionOrEarlier());

- EXPECT_TRUE(IsOSLionOrLater());

EXPECT_FALSE(IsOSMountainLion());

EXPECT_FALSE(IsOSMountainLionOrEarlier());

EXPECT_TRUE(IsOSMountainLionOrLater());

« base/files/file_path_watcher.cc ('K') | « base/mac/mac_util.mm ('k') | base/process/memory_mac.mm » ('j') | chrome/browser/ui/cocoa/spinner_view.mm » ('J')