Fix OperatingSystemName and OperatingSystemVersion on Mac

content/browser/gpu/gpu_blacklist.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 "content/browser/gpu/gpu_blacklist.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
@@ skipping 642 matching lines @@
     GpuBlacklist::OsType os,
     Version* os_version,
     const GPUInfo& gpu_info) {
   active_entries_.clear();
   GpuFeatureFlags flags;
 
   if (os == kOsAny)
     os = GetOsType();
   scoped_ptr<Version> my_os_version;
   if (os_version == NULL) {
-    std::string version_string;
-#if defined(OS_MACOSX)
-    // Seems like base::SysInfo::OperatingSystemVersion() returns the wrong
-    // version in MacOsx.
-    int32 version_major, version_minor, version_bugfix;
-    base::SysInfo::OperatingSystemVersionNumbers(
-        &version_major, &version_minor, &version_bugfix);
-    version_string = base::StringPrintf("%d.%d.%d",
-                                        version_major,
-                                        version_minor,
-                                        version_bugfix);
-#else
-    version_string = base::SysInfo::OperatingSystemVersion();
+    std::string version_string = base::SysInfo::OperatingSystemVersion();
     size_t pos = version_string.find_first_not_of("0123456789.");
     if (pos != std::string::npos)
       version_string = version_string.substr(0, pos);
-#endif
     my_os_version.reset(Version::GetVersionFromString(version_string));
     os_version = my_os_version.get();
   }
   DCHECK(os_version != NULL);
 
   for (size_t i = 0; i < blacklist_.size(); ++i) {
     if (blacklist_[i]->Contains(os, *os_version, gpu_info)) {
       flags.Combine(blacklist_[i]->GetGpuFeatureFlags());
       active_entries_.push_back(blacklist_[i]);
     }
@@ skipping 256 matching lines @@
     browser_version_info.reset(
       new VersionInfo(version_op, version_string, version_string2));
     if (!browser_version_info->IsValid())
       return kMalformed;
     if (browser_version_info->Contains(*browser_version_))
       return kSupported;
     return kUnsupported;
   }
   return kSupported;
 }