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

Unified Diff: base/test/expectations/expectation.cc

Issue 1446363003: Deleted OS_WIN and all Windows specific files from base. (Closed) Base URL: https://github.com/domokit/mojo.git@base_tests
Patch Set: Created 5 years, 1 month 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 | « base/test/data/pe_image/pe_image_test_64.dll ('k') | base/test/launcher/test_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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";
« no previous file with comments | « base/test/data/pe_image/pe_image_test_64.dll ('k') | base/test/launcher/test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698