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

base/sys_info_unittest.cc

-// 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.
 
 #include "base/file_util.h"
 #include "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 typedef PlatformTest SysInfoTest;
 
@@ skipping 48 matching lines @@
   int32 os_major_version = -1;
   int32 os_minor_version = -1;
   int32 os_bugfix_version = -1;
   std::string lsb_release("FOO=1234123.34.5\n");
   lsb_release.append(base::SysInfo::GetLinuxStandardBaseVersionKey());
   lsb_release.append("=1.2.3.4\n");
   base::SysInfo::ParseLsbRelease(lsb_release,
                                  &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) {
   int32 os_major_version = -1;
   int32 os_minor_version = -1;
   int32 os_bugfix_version = -1;
   std::string lsb_release(base::SysInfo::GetLinuxStandardBaseVersionKey());
   lsb_release.append("=1.2.3.4\n");
   lsb_release.append("FOO=1234123.34.5\n");
   base::SysInfo::ParseLsbRelease(lsb_release,
                                  &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) {
   int32 os_major_version = -1;
   int32 os_minor_version = -1;
   int32 os_bugfix_version = -1;
   std::string lsb_release("FOO=1234123.34.5\n");
   base::SysInfo::ParseLsbRelease(lsb_release,
                                  &os_major_version,
                                  &os_minor_version,
                                  &os_bugfix_version);
   EXPECT_EQ(-1, os_major_version);
   EXPECT_EQ(-1, os_minor_version);
   EXPECT_EQ(-1, os_bugfix_version);
 }
 
 #endif  // OS_CHROMEOS