Move Android user agent generation to native code

webkit/glue/user_agent.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 "webkit/glue/user_agent.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Generated
 #include "webkit_version.h"  // NOLINT
 
-#if defined(OS_ANDROID)
-namespace {
-
-base::LazyInstance<std::string>::Leaky g_os_info = LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-#endif
-
 namespace webkit_glue {
 
 std::string GetWebKitVersion() {
   return base::StringPrintf("%d.%d (%s)",
                             WEBKIT_VERSION_MAJOR,
                             WEBKIT_VERSION_MINOR,
                             WEBKIT_SVN_REVISION);
 }
 
 std::string GetWebKitRevision() {
@@ skipping 55 matching lines @@
       os_bugfix_version
 #elif defined(OS_CHROMEOS)
       "CrOS "
       "%s %d.%d.%d",
       cputype.c_str(),   // e.g. i686
       os_major_version,
       os_minor_version,
       os_bugfix_version
 #elif defined(OS_ANDROID)
       "Android %s",
-      g_os_info.Get().c_str()
+      base::SysInfo::OperatingSystemInformation().c_str()
 #else
       "%s %s",
       unixinfo.sysname,  // e.g. Linux
       cputype.c_str()    // e.g. i686
 #endif
   );  // NOLINT
 
   return os_cpu;
 }
 
@@ skipping 32 matching lines @@
       kUserAgentPlatform,
       webkit_glue::BuildOSCpuInfo().c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
-#if defined(OS_ANDROID)
-void SetUserAgentOSInfo(const std::string& os_info) {
-  g_os_info.Get() = os_info;
-}
-#endif
 
 }  // namespace webkit_glue