Parse /etc/lsb-release only once on ChromeOS

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
@@ skipping 58 matching lines @@
 #include "chrome/app/chrome_breakpad_client.h"
 #include "components/breakpad/breakpad_client.h"
 #endif
 
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
 #include "components/nacl/common/nacl_paths.h"
 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "base/i18n/time_formatting.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/common/descriptors_android.h"
 #else
 // Diagnostics is only available on non-android platforms.
@@ skipping 650 matching lines @@
   if (!process_type.empty() && process_type != switches::kZygoteProcess) {
 #if defined(OS_ANDROID)
     InitNonBrowserCrashReporterForAndroid();
 #else
     InitCrashReporter();
 #endif
   }
 #endif
 
 #if defined(OS_CHROMEOS)
-  // Read and cache ChromeOS version from file,
-  // to be used from inside the sandbox.
+  // Read and cache ChromeOS version, to be used from inside the sandbox.
   int32 major_version, minor_version, bugfix_version;
   base::SysInfo::OperatingSystemVersionNumbers(

[pneubeck (no reviews), 2013/09/24 07:44:51]

This call assumes more about the SysInfo implementation than the SysInfo
interface declares.
Instead there should be a call base::SysInfo::CacheVersionNumbers() (or more
scalable CacheInfo() ).

[stevenjb, 2013/09/24 17:18:34]

I actually don't know why this was put here and didn't notice that these weren't
being used. I'm going to eliminate this block entirely, I don't think it is
useful. We'll see if the tests agree with me.

       &major_version, &minor_version, &bugfix_version);
+  std::string lsb_source;
+  base::SysInfo::GetLsbReleaseValue("lsb-source", &lsb_source);
+  VLOG(1) << "lsb-release source: " << lsb_source;
+  VLOG(1) << "lsb-release time: "
+          << base::TimeFormatShortDateAndTime(
+              base::SysInfo::GetLsbReleaseTime());

[Daniel Erat, 2013/09/24 15:37:53]

nit: indenting one space seems strange -- indent four spaces beyond the previous
line's "base", perhaps?

[stevenjb, 2013/09/24 17:18:34]

Removed.

 #endif
 }
 
 void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
   startup_timer_->Stop();  // End of Startup Time Measurement.
 
   // Note: If you are adding a new process type below, be sure to adjust the
   // AdjustLinuxOOMScore function too.
 #if defined(OS_LINUX)
   AdjustLinuxOOMScore(process_type);
@@ skipping 117 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return &g_chrome_content_utility_client.Get();
 #endif
 }