Improve and unify Mac OS X run-time version checks

chrome/browser/bug_report_util.cc

 // Copyright (c) 2011 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/bug_report_util.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 149 matching lines @@
 void BugReportUtil::SetOSVersion(std::string* os_version) {
 #if defined(OS_WIN)
   base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
   base::win::OSInfo::VersionNumber version_number = os_info->version_number();
   *os_version = StringPrintf("%d.%d.%d", version_number.major,
                              version_number.minor, version_number.build);
   int service_pack = os_info->service_pack().major;
   if (service_pack > 0)
     os_version->append(StringPrintf("Service Pack %d", service_pack));
 #elif defined(OS_MACOSX)
-  int32 major;
-  int32 minor;
-  int32 bugFix;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugFix);
-  *os_version = StringPrintf("%d.%d.%d", major, minor, bugFix);
+  *os_version = base::SysInfo::OperatingSystemVersion();

[Avi (use Gerrit), 2011/06/13 22:45:22]

DCHECK? NOTIMPLEMENTED?

[Mark Mentovai, 2011/06/14 00:18:26]

Avi wrote:
I don’t get it. What would you DCHECK or NOTIMPLEMENTED here?

The Mac’s base::SysInfo::OperatingSystemVersion (base/sys_info_mac.cc) does
|base::StringPrintf("%d.%d.%d", major, minor, bugfix)| in exactly the same way
as the code that had been here.

[Avi (use Gerrit), 2011/06/14 01:40:23]

Misread. My bad.

 #else
   *os_version = "unknown";
 #endif
 }
 
 // static
 std::string BugReportUtil::feedback_server_("");
 
 // static
 void BugReportUtil::SetFeedbackServer(const std::string& server) {
@@ skipping 195 matching lines @@
 // static
 void BugReportUtil::ReportPhishing(TabContents* currentTab,
                                    const std::string& phishing_url) {
   currentTab->controller().LoadURL(
       safe_browsing_util::GeneratePhishingReportUrl(
           kReportPhishingUrl, phishing_url,
           false /* not client-side detection */),
       GURL(),
       PageTransition::LINK);
 }