Move Android user agent generation to native code

webkit/glue/user_agent.cc

Index: webkit/glue/user_agent.cc
diff --git a/webkit/glue/user_agent.cc b/webkit/glue/user_agent.cc
index 516504081f136db4e1551c71f4a3237b020e373e..4846906839d488fa0a160142f3e72e4bee3bd5c7 100644
--- a/webkit/glue/user_agent.cc
+++ b/webkit/glue/user_agent.cc
@@ -20,14 +20,6 @@
 // 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() {
@@ -103,7 +95,7 @@ std::string BuildOSCpuInfo() {
       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
@@ -156,10 +148,5 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
   return user_agent;
 }
 
-#if defined(OS_ANDROID)
-void SetUserAgentOSInfo(const std::string& os_info) {
-  g_os_info.Get() = os_info;
-}
-#endif
 
 }  // namespace webkit_glue