Revert 88470 (broke ServiceProcessStateTest.ForceShutdown on CrOS) - Fix for system version unit tests in cros.

BUG=chromium-os:15789
TEST=Ran try servers to make sure the unit test is not failing anymore, plus viewed all the screens and took screenshots. Screen shots of all effected screens are attached to the cros bug
TBR=rkc@chromium.org

TBR=rkc@chromium.org
Review URL: http://codereview.chromium.org/7044086

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88545 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
index f724f99..cd17c18 100644
--- a/base/sys_info_chromeos.cc
+++ b/base/sys_info_chromeos.cc
@@ -94,20 +94,17 @@ void SysInfo::ParseLsbRelease(const std::string& lsb_release,
   size_t length = lsb_release.find_first_of('\n', start_index) - start_index;
   std::string version = lsb_release.substr(start_index, length);
   StringTokenizer tokenizer(version, ".");
-  // TODO(rkc): Ignore the 0. here; fix this once we move Chrome OS version
-  // numbers from the 0.xx.yyy.zz format to the xx.yyy.zz format.
-  // Refer to http://code.google.com/p/chromium-os/issues/detail?id=15789
-  for (int i = 0; i < 4 && tokenizer.GetNext(); i++) {
-    if (1 == i) {
+  for (int i = 0; i < 3 && tokenizer.GetNext(); i++) {
+    if (0 == i) {
       StringToInt(tokenizer.token_begin(),
                   tokenizer.token_end(),
                   major_version);
       *minor_version = *bugfix_version = 0;
-    } else if (2 == i) {
+    } else if (1 == i) {
       StringToInt(tokenizer.token_begin(),
                   tokenizer.token_end(),
                   minor_version);
-    } else {  // 3 == i
+    } else {  // 2 == i
       StringToInt(tokenizer.token_begin(),
                   tokenizer.token_end(),
                   bugfix_version);