Parse /etc/lsb-release only once on ChromeOS

chrome/browser/chromeos/system/statistics_provider.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 "chrome/browser/chromeos/system/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
 #include "chromeos/chromeos_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/system/name_value_pairs_parser.h"
 #include "content/public/browser/browser_thread.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
-// TODO(phajdan.jr): Drop that dependency, http://crbug.com/180711 .
-#include "chrome/common/chrome_version_info.h"
-#endif
-
 using content::BrowserThread;
 
 namespace chromeos {
 namespace system {
 namespace {
 
 // Path to the tool used to get system info, and delimiters for the output
 // format of the tool.
 const char* kCrosSystemTool[] = { "/usr/bin/crossystem" };
 const char kCrosSystemEq[] = "=";
@@ skipping 11 matching lines @@
 const char kMachineHardwareInfoFile[] = "/tmp/machine-info";
 const char kMachineHardwareInfoEq[] = "=";
 const char kMachineHardwareInfoDelim[] = " \n";
 
 // File to get ECHO coupon info from, and key/value delimiters of
 // the file.
 const char kEchoCouponFile[] = "/var/cache/echo/vpd_echo.txt";
 const char kEchoCouponEq[] = "=";
 const char kEchoCouponDelim[] = "\n";
 
-// File to get machine OS info from, and key/value delimiters of the file.
-const char kMachineOSInfoFile[] = "/etc/lsb-release";
-const char kMachineOSInfoEq[] = "=";
-const char kMachineOSInfoDelim[] = "\n";
-
 // File to get VPD info from, and key/value delimiters of the file.
 const char kVpdFile[] = "/var/log/vpd_2.0.txt";
 const char kVpdEq[] = "=";
 const char kVpdDelim[] = "\n";
 
 // Timeout that we should wait for statistics to get loaded
 const int kTimeoutSecs = 3;
 
 // The location of OEM manifest file used to trigger OOBE flow for kiosk mode.
 const CommandLine::CharType kOemManifestFilePath[] =
     FILE_PATH_LITERAL("/usr/share/oem/oobe/manifest.json");
 
 }  // namespace
 
 // Key values for GetMachineStatistic()/GetMachineFlag() calls.
 const char kDevSwitchBootMode[] = "devsw_boot";
 const char kHardwareClass[] = "hardware_class";
-const char kMachineInfoBoard[] =
-    "CHROMEOS_RELEASE_BOARD";
 const char kOffersCouponCodeKey[] = "ubind_attribute";
 const char kOffersGroupCodeKey[] = "gbind_attribute";
 const char kOemCanExitEnterpriseEnrollmentKey[] =
     "oem_can_exit_enrollment";
 const char kOemDeviceRequisitionKey[] =
     "oem_device_requisition";
 const char kOemIsEnterpriseManagedKey[] =
     "oem_enterprise_managed";
 const char kOemKeyboardDrivenOobeKey[] =
     "oem_keyboard_driven_oobe";
@@ skipping 13 matching lines @@
   static StatisticsProviderImpl* GetInstance();
 
  protected:
   StatisticsProviderImpl();
   void LoadOemManifestFromFile(const base::FilePath& file);
 
  private:
   typedef std::map<std::string, bool> MachineFlags;
   friend struct DefaultSingletonTraits<StatisticsProviderImpl>;
 
-  // Loads the machine info file, which is necessary to get the Chrome channel.
-  // Treat MachineOSInfoFile specially, as distribution channel information
-  // (stable, beta, dev, canary) is required at earlier stage than everything
-  // else. Rather than posting a delayed task, read and parse the machine OS
-  // info file immediately.
-  void LoadMachineOSInfoFile();
-
   // Loads the machine statistcs by examining the system.
   void LoadMachineStatistics();
 
   bool initialized_;
   bool load_statistics_started_;
   NameValuePairsParser::NameValueMap machine_info_;
   MachineFlags machine_flags_;
   base::WaitableEvent on_statistics_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(StatisticsProviderImpl);
 };
 
 void StatisticsProviderImpl::Init() {
   DCHECK(!initialized_);
   initialized_ = true;
-
-  // Load the machine info file immediately to get the channel info.
-  LoadMachineOSInfoFile();
 }
 
 bool StatisticsProviderImpl::GetMachineStatistic(
     const std::string& name, std::string* result) {
   DCHECK(initialized_);
   DCHECK(load_statistics_started_);
 
   VLOG(1) << "Statistic is requested for " << name;
   // Block if the statistics are not loaded yet. Per LOG(WARNING) below,
   // the statistics are loaded before requested as of now. For regular
@@ skipping 43 matching lines @@
 }
 
 // manual_reset needs to be true, as we want to keep the signaled state.
 StatisticsProviderImpl::StatisticsProviderImpl()
     : initialized_(false),
       load_statistics_started_(false),
       on_statistics_loaded_(true  /* manual_reset */,
                             false /* initially_signaled */) {
 }
 
-void StatisticsProviderImpl::LoadMachineOSInfoFile() {
-  NameValuePairsParser parser(&machine_info_);
-  if (parser.GetNameValuePairsFromFile(base::FilePath(kMachineOSInfoFile),
-                                       kMachineOSInfoEq,
-                                       kMachineOSInfoDelim)) {
-#if defined(GOOGLE_CHROME_BUILD)
-    const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK";
-    NameValuePairsParser::NameValueMap::iterator iter =
-        machine_info_.find(kChromeOSReleaseTrack);
-    if (iter != machine_info_.end())
-      chrome::VersionInfo::SetChannel(iter->second);
-#endif
-  }
-}
-
 void StatisticsProviderImpl::StartLoadingMachineStatistics() {
   DCHECK(initialized_);
   DCHECK(!load_statistics_started_);
   load_statistics_started_ = true;
 
   VLOG(1) << "Started loading statistics";
   BrowserThread::PostBlockingPoolTask(
       FROM_HERE,
       base::Bind(&StatisticsProviderImpl::LoadMachineStatistics,
                  base::Unretained(this)));
@@ skipping 105 matching lines @@
 StatisticsProvider* StatisticsProvider::GetInstance() {
   if (base::chromeos::IsRunningOnChromeOS()) {
     return StatisticsProviderImpl::GetInstance();
   } else {
     return StatisticsProviderStubImpl::GetInstance();
   }
 }
 
 }  // namespace system
 }  // namespace chromeos