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

Side by Side Diff: base/test/expectations/expectation.cc

Issue 25286002: Update OS version functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uma Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/test/expectations/expectation.h" 5 #include "base/test/expectations/expectation.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #elif defined(OS_IOS) 101 #elif defined(OS_IOS)
102 platform.name = "iOS"; 102 platform.name = "iOS";
103 #elif defined(OS_MACOSX) 103 #elif defined(OS_MACOSX)
104 platform.name = "Mac"; 104 platform.name = "Mac";
105 if (base::mac::IsOSSnowLeopard()) 105 if (base::mac::IsOSSnowLeopard())
106 platform.variant = "10.6"; 106 platform.variant = "10.6";
107 else if (base::mac::IsOSLion()) 107 else if (base::mac::IsOSLion())
108 platform.variant = "10.7"; 108 platform.variant = "10.7";
109 else if (base::mac::IsOSMountainLion()) 109 else if (base::mac::IsOSMountainLion())
110 platform.variant = "10.8"; 110 platform.variant = "10.8";
111 else if (base::mac::IsOSMavericks())
112 platform.variant = "10.9";
111 #elif defined(OS_CHROMEOS) 113 #elif defined(OS_CHROMEOS)
112 platform.name = "ChromeOS"; 114 platform.name = "ChromeOS";
113 #elif defined(OS_ANDROID) 115 #elif defined(OS_ANDROID)
114 platform.name = "Android"; 116 platform.name = "Android";
115 #elif defined(OS_LINUX) 117 #elif defined(OS_LINUX)
116 platform.name = "Linux"; 118 platform.name = "Linux";
117 std::string arch = base::SysInfo::OperatingSystemArchitecture(); 119 std::string arch = base::SysInfo::OperatingSystemArchitecture();
118 if (arch == "x86") 120 if (arch == "x86")
119 platform.variant = "32"; 121 platform.variant = "32";
120 else if (arch == "x86_64") 122 else if (arch == "x86_64")
(...skipping 27 matching lines...) Expand all
148 } 150 }
149 151
150 Expectation::Expectation() 152 Expectation::Expectation()
151 : configuration(CONFIGURATION_UNSPECIFIED), 153 : configuration(CONFIGURATION_UNSPECIFIED),
152 result(RESULT_PASS) { 154 result(RESULT_PASS) {
153 } 155 }
154 156
155 Expectation::~Expectation() {} 157 Expectation::~Expectation() {}
156 158
157 } // namespace test_expectations 159 } // namespace test_expectations
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698