Merge 88595 - Revert 88545 - Revert 88470 (broke ServiceProcessStateTest.ForceShutdown on CrOS) -...

base/sys_info_unittest.cc

Index: base/sys_info_unittest.cc
===================================================================
--- base/sys_info_unittest.cc	(revision 89114)
+++ base/sys_info_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -67,9 +67,9 @@
                                  &os_major_version,
                                  &os_minor_version,
                                  &os_bugfix_version);
-  EXPECT_EQ(1, os_major_version);
-  EXPECT_EQ(2, os_minor_version);
-  EXPECT_EQ(3, os_bugfix_version);
+  EXPECT_EQ(2, os_major_version);
+  EXPECT_EQ(3, os_minor_version);
+  EXPECT_EQ(4, os_bugfix_version);
 }
 
 TEST_F(SysInfoTest, GoogleChromeOSVersionNumbersFirst) {
@@ -83,9 +83,9 @@
                                  &os_major_version,
                                  &os_minor_version,
                                  &os_bugfix_version);
-  EXPECT_EQ(1, os_major_version);
-  EXPECT_EQ(2, os_minor_version);
-  EXPECT_EQ(3, os_bugfix_version);
+  EXPECT_EQ(2, os_major_version);
+  EXPECT_EQ(3, os_minor_version);
+  EXPECT_EQ(4, os_bugfix_version);
 }
 
 TEST_F(SysInfoTest, GoogleChromeOSNoVersionNumbers) {