Set linux distro to CHROMEOS_RELEASE_DESCRIPTION on ChromeOS

chrome/browser/chrome_browser_main_linux.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/chrome_browser_main_linux.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 #endif
 
@@ skipping 12 matching lines @@
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #endif
 
 #endif  // defined(USE_LINUX_BREAKPAD)
 
 namespace {
 
 #if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_CHROMEOS)
+void ChromeOSVersionCallback(chromeos::VersionLoader::Handle,
+                             std::string version)

[brettw, 2012/08/14 19:42:32]

Can you make this a const ref? I know you didn't add this but if it's easy it
seems nice to fix now.

[Rick Byers, 2012/08/14 20:07:00]

I don't think so.  CancelableRequest dispatches the response back to the
original requesting thread, so we have to copy the string by value.  Or am I
missing something?

Of course in this case that seems like overkill - I think I could have safely
called SetLinuxDistro from the FILE thread and avoided posting back to the main
thread.  But I think it's better to be consistent across all the places we read
this version info, and certainly in the WebUI cases we need to get back to the
right thread.  This does seem like an awefull lot of machinery for something
that should be pretty simple though...

[brettw, 2012/08/14 20:08:52]

Bind should know to copy const ref args.

+{

[brettw, 2012/08/14 19:42:32]

Check { placement.

[Rick Byers, 2012/08/14 20:07:00]

Done.

+  base::SetLinuxDistro(std::string("CrOS ") + version);
+}
+#else
 void GetLinuxDistroCallback() {
   base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
 }
+#endif
 
 bool IsCrashReportingEnabled(const PrefService* local_state) {
   // Check whether we should initialize the crash reporter. It may be disabled
   // through configuration policy or user preference. It must be disabled for
   // Guest mode on Chrome OS in Stable channel.
   // The kHeadless environment variable overrides the decision, but only if the
   // crash service is under control of the user. It is used by QA testing
   // infrastructure to switch on generation of crash reports.
 #if defined(OS_CHROMEOS)
   bool is_guest_session =
@@ skipping 26 matching lines @@
 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsPosix(parameters) {
 }
 
 ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
 }
 
 void ChromeBrowserMainPartsLinux::PreProfileInit() {
 #if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_CHROMEOS)
+  cros_version_loader_.GetVersion(&cros_consumer_,
+                                  base::Bind(&ChromeOSVersionCallback),
+                                  chromeos::VersionLoader::VERSION_FULL);
+#else
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.  This happens in PreCreateThreads.
   content::BrowserThread::PostTask(content::BrowserThread::FILE,
                                    FROM_HERE,
                                    base::Bind(&GetLinuxDistroCallback));
+#endif
 
   if (IsCrashReportingEnabled(local_state()))
     InitCrashReporter();
 #endif
 
 #if !defined(OS_CHROMEOS)
   const FilePath kDefaultMtabPath("/etc/mtab");
   media_device_notifications_linux_ =
       new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath);
   media_device_notifications_linux_->Init();
 #endif
 
   ChromeBrowserMainPartsPosix::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
 #if !defined(OS_CHROMEOS)
   // Release it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost ever
   // single browser_test.
   media_device_notifications_linux_ = NULL;
 #endif
 
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }