Additional fix for Sandboxed WebKit on OS X.

webkit/glue/webkit_glue.cc

 // Copyright (c) 2006-2008 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 "base/compiler_specific.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 19 matching lines @@
 #include "ScriptController.h"
 #include "SharedBuffer.h"
 MSVC_POP_WARNING();
 
 #undef LOG
 #include "webkit/glue/webkit_glue.h"
 
 #include "base/file_version_info.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
+#include "base/sys_info.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/weburlrequest_impl.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 //------------------------------------------------------------------------------
 // webkit_glue impl:
 
@@ skipping 279 matching lines @@
   bool user_agent_is_overridden;
 };
 
 Singleton<UserAgentState> g_user_agent;
 
 void BuildUserAgent(bool mimic_safari, std::string* result) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
-#if defined(OS_WIN)
-  OSVERSIONINFO info = {0};
-  info.dwOSVersionInfoSize = sizeof(info);
-  GetVersionEx(&info);
-  os_major_version = info.dwMajorVersion;
-  os_minor_version = info.dwMinorVersion;
-#elif defined(OS_MACOSX)
-  Gestalt(gestaltSystemVersionMajor, 
-      reinterpret_cast<SInt32*>(&os_major_version));
-  Gestalt(gestaltSystemVersionMinor, 
-      reinterpret_cast<SInt32*>(&os_minor_version));
-  Gestalt(gestaltSystemVersionBugFix, 
-      reinterpret_cast<SInt32*>(&os_bugfix_version));
-#endif
+  base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
+                                               &os_minor_version,
+                                               &os_bugfix_version);
 
   // Get the product name and version, and replace Safari's Version/X string
   // with it.  This is done to expose our product name in a manner that is
   // maximally compatible with Safari, we hope!!
   std::string product;
 
   if (!mimic_safari) {
     scoped_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfoForCurrentModule());
     if (version_info.get())
@@ skipping 92 matching lines @@
   }
 
   g_forcefully_terminate_plugin_process = value;
 }
 
 bool ShouldForcefullyTerminatePluginProcess() {
   return g_forcefully_terminate_plugin_process;
 }
 
 } // namespace webkit_glue