| Index: base/test/expectations/expectation.cc
|
| diff --git a/base/test/expectations/expectation.cc b/base/test/expectations/expectation.cc
|
| index 30817791dd2da22d4f612c0959cd0864ae3f9a6c..62d81dd49f2ecb1e6d6be87ef83b8c536810a342 100644
|
| --- a/base/test/expectations/expectation.cc
|
| +++ b/base/test/expectations/expectation.cc
|
| @@ -6,9 +6,7 @@
|
|
|
| #include "base/logging.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#elif defined(OS_MACOSX) && !defined(OS_IOS)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| #include "base/mac/mac_util.h"
|
| #elif defined(OS_LINUX)
|
| #include "base/sys_info.h"
|
| @@ -89,18 +87,7 @@ bool PlatformFromString(const base::StringPiece& modifier,
|
|
|
| Platform GetCurrentPlatform() {
|
| Platform platform;
|
| -#if defined(OS_WIN)
|
| - platform.name = "Win";
|
| - base::win::Version version = base::win::GetVersion();
|
| - if (version == base::win::VERSION_XP)
|
| - platform.variant = "XP";
|
| - else if (version == base::win::VERSION_VISTA)
|
| - platform.variant = "Vista";
|
| - else if (version == base::win::VERSION_WIN7)
|
| - platform.variant = "7";
|
| - else if (version == base::win::VERSION_WIN8)
|
| - platform.variant = "8";
|
| -#elif defined(OS_IOS)
|
| +#if defined(OS_IOS)
|
| platform.name = "iOS";
|
| #elif defined(OS_MACOSX)
|
| platform.name = "Mac";
|
|
|