Move IsRunningOnChromeOS to SysInfo

base/sys_info_chromeos.cc

 // Copyright (c) 2012 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/sys_info.h"
 
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 10 matching lines @@
 namespace {
 
 const char* kLinuxStandardBaseVersionKeys[] = {
   "CHROMEOS_RELEASE_VERSION",
   "GOOGLE_RELEASE",
   "DISTRIB_RELEASE",
 };
 const size_t kLinuxStandardBaseVersionKeysLength =
     arraysize(kLinuxStandardBaseVersionKeys);
 
+static const char* kChromeOsReleaseNameKey = "CHROMEOS_RELEASE_NAME";

[satorux1, 2013/09/24 04:09:01]

nit: 'static' is unnecessary.

const char kChromeOsReleaseNameKey[] = "..."

is more efficient per http://udrepper.livejournal.com/13851.html

[stevenjb, 2013/09/26 22:07:38]

Oops, thanks for catching. Done.

+
+const char* kChromeOsReleaseNames[] = {
+  "Chrome OS",
+  "Chromium OS",
+};
+const size_t kChromeOsReleaseNamesLength = arraysize(kChromeOsReleaseNames);
+
 const char kLinuxStandardBaseReleaseFile[] = "/etc/lsb-release";
 
 class ChromeOSVersionInfo {
  public:
   ChromeOSVersionInfo() {
     Parse();
   }
 
   void Parse() {
     lsb_release_map_.clear();
     major_version_ = 0;
     minor_version_ = 0;
     bugfix_version_ = 0;
+    is_running_on_chromeos_ = false;
 
     std::string lsb_release, lsb_release_time_str;
     scoped_ptr<base::Environment> env(base::Environment::Create());
     bool parsed_from_env =
         env->GetVar("LSB_RELEASE", &lsb_release) &&
         env->GetVar("LSB_RELEASE_TIME", &lsb_release_time_str);
     if (parsed_from_env) {
       double us = 0;
       StringToDouble(lsb_release_time_str, &us);
       lsb_release_time_ = base::Time::FromDoubleT(us);
@@ skipping 26 matching lines @@
                          int32* bugfix_version) {
     *major_version = major_version_;
     *minor_version = minor_version_;
     *bugfix_version = bugfix_version_;
   }
 
   const base::Time& lsb_release_time() const { return lsb_release_time_; }
   const SysInfo::LsbReleaseMap& lsb_release_map() const {
     return lsb_release_map_;
   }
+  bool is_running_on_chromeos() const { return is_running_on_chromeos_; }
 
  private:
   void ParseLsbRelease(const std::string& lsb_release) {
     // Parse lsb_release key pairs.
     std::vector<std::pair<std::string, std::string> > pairs;
     base::SplitStringIntoKeyValuePairs(lsb_release, '=', '\n', &pairs);
     for (size_t i = 0; i  < pairs.size(); ++i) {
       std::string key, value;
       TrimWhitespaceASCII(pairs[i].first, TRIM_ALL, &key);
       TrimWhitespaceASCII(pairs[i].second, TRIM_ALL, &value);
@@ skipping 14 matching lines @@
                   &major_version_);
     }
     if (tokenizer.GetNext()) {
       StringToInt(StringPiece(tokenizer.token_begin(), tokenizer.token_end()),
                   &minor_version_);
     }
     if (tokenizer.GetNext()) {
       StringToInt(StringPiece(tokenizer.token_begin(), tokenizer.token_end()),
                   &bugfix_version_);
     }
+
+    // Check release name for Chrome OS.
+    std::string release_name;
+    if (GetLsbReleaseValue(kChromeOsReleaseNameKey, &release_name)) {
+      for (size_t i = 0; i < kChromeOsReleaseNamesLength; ++i) {

[satorux1, 2013/09/24 04:09:01]

remove kChromeOsReleaseNamesLength?

arraysize(kChromeOsReleaseNames) seems to be easier to read.

[stevenjb, 2013/09/26 22:07:38]

Done.

+        if (release_name == kChromeOsReleaseNames[i]) {
+          is_running_on_chromeos_ = true;
+          break;
+        }
+      }
+    }
   }
 
   base::Time lsb_release_time_;
   SysInfo::LsbReleaseMap lsb_release_map_;
   int32 major_version_;
   int32 minor_version_;
   int32 bugfix_version_;
+  bool is_running_on_chromeos_;
 };
 
 static LazyInstance<ChromeOSVersionInfo>
     g_chrome_os_version_info = LAZY_INSTANCE_INITIALIZER;
 
 ChromeOSVersionInfo& GetChromeOSVersionInfo() {
   return g_chrome_os_version_info.Get();
 }
 
 }  // namespace
@@ skipping 24 matching lines @@
     board = "unknown";
   return board;
 }
 
 // static
 base::Time SysInfo::GetLsbReleaseTime() {
   return GetChromeOSVersionInfo().lsb_release_time();
 }
 
 // static
+bool SysInfo::IsRunningOnChromeOS() {
+  return GetChromeOSVersionInfo().is_running_on_chromeos();
+}
+
+// static
 void SysInfo::SetChromeOSVersionInfoForTest(const std::string& lsb_release,
                                             double lsb_release_time) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   env->SetVar("LSB_RELEASE", lsb_release);
   // LSB_RELEASE_TIME must be set to read LSB_RELEASE from the env.
   env->SetVar("LSB_RELEASE_TIME", base::DoubleToString(lsb_release_time));
   g_chrome_os_version_info.Get().Parse();
 }
 
 }  // namespace base