Revert 88440 - Change Chrome OS version numbers to Platform versions.

chrome/browser/chromeos/version_loader.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/chromeos/version_loader.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
 #include "content/browser/browser_thread.h"
 
 namespace chromeos {
 
 // File to look for version number in.
 static const char kPathVersion[] = "/etc/lsb-release";
 
-// TODO(rkc): Remove once we change over the Chrome OS version format.
-// Done for http://code.google.com/p/chromium-os/issues/detail?id=15789
-static const size_t kTrimVersion = 2;
-
 // File to look for firmware number in.
 static const char kPathFirmware[] = "/var/log/bios_info.txt";
 
 VersionLoader::VersionLoader() : backend_(new Backend()) {}
 
 VersionLoader::~VersionLoader() {}
 
 // Beginning of line we look for that gives full version number.
 // Format: x.x.xx.x (Developer|Official build extra info) board info
 // static
@@ skipping 37 matching lines @@
 
   scoped_refptr<GetFirmwareRequest> request(new GetFirmwareRequest(callback));
   AddRequest(request, consumer);
 
   g_browser_process->file_thread()->message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(backend_.get(), &Backend::GetFirmware, request));
   return request->handle();
 }
 
-void VersionLoader::EnablePlatformVersions(bool enable) {
-  backend_.get()->set_parse_as_platform(enable);
-}
-
 // static
 std::string VersionLoader::ParseVersion(const std::string& contents,
                                         const std::string& prefix) {
   // The file contains lines such as:
   // XXX=YYY
   // AAA=ZZZ
   // Split the lines and look for the one that starts with prefix. The version
   // file is small, which is why we don't try and be tricky.
   std::vector<std::string> lines;
   base::SplitString(contents, '\n', &lines);
@@ skipping 41 matching lines @@
   if (request->canceled())
     return;
 
   std::string version;
   std::string contents;
   const FilePath file_path(kPathVersion);
   if (file_util::ReadFileToString(file_path, &contents)) {
     version = ParseVersion(
         contents,
         (format == VERSION_FULL) ? kFullVersionPrefix : kVersionPrefix);
-
-    // TODO(rkc): Fix this once we move to xx.yyy version numbers for Chrome OS
-    // instead of 0.xx.yyy
-    // Done for http://code.google.com/p/chromium-os/issues/detail?id=15789
-    if (parse_as_platform_) {
-      if (version.size() > kTrimVersion) {
-        version = version.substr(kTrimVersion);
-        // Strip the major version.
-        size_t first_dot = version.find(".");
-        if (first_dot != std::string::npos) {
-          version = version.substr(first_dot + 1);
-        }
-      }
-    }
   }
 
   if (format == VERSION_SHORT_WITH_DATE) {
     base::PlatformFileInfo fileinfo;
     if (file_util::GetFileInfo(file_path, &fileinfo)) {
       base::Time::Exploded ctime;
       fileinfo.creation_time.UTCExplode(&ctime);
       version += StringPrintf("-%02u.%02u.%02u",
                               ctime.year % 100,
                               ctime.month,
@@ skipping 16 matching lines @@
   const FilePath file_path(kPathFirmware);
   if (file_util::ReadFileToString(file_path, &contents)) {
     firmware = ParseFirmware(contents);
   }
 
   request->ForwardResult(GetFirmwareCallback::TupleType(request->handle(),
                                                         firmware));
 }
 
 }  // namespace chromeos