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() {
   return WEBKIT_SVN_REVISION;
 }
 
 std::string BuildOSCpuInfo() {
   std::string os_cpu;
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ||\
+    defined(OS_ANDROID)
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
 #endif
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   // Should work on any Posix system.
   struct utsname unixinfo;
   uname(&unixinfo);
 
   std::string cputype;
   // special case for biarch systems
   if (strcmp(unixinfo.machine, "x86_64") == 0 &&
       sizeof(void*) == sizeof(int32)) {  // NOLINT
     cputype.assign("i686 (x86_64)");
@@ skipping 10 matching lines @@
   } else {
     base::win::OSInfo::WindowsArchitecture windows_architecture =
         os_info->architecture();
     if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE)
       architecture_token = "; Win64; x64";
     else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)
       architecture_token = "; Win64; IA64";
   }
 #endif
 
+#if defined(OS_ANDROID)
+  std::string android_info_str;
+
+  // Send information about the device.
+  bool semicolon_inserted = false;
+  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+  std::string android_device_name = base::SysInfo::GetDeviceName();
+  if ("REL" == android_build_codename && android_device_name.size() > 0) {
+    android_info_str += "; " + android_device_name;
+    semicolon_inserted = true;
+  }
+
+  // Append the build ID.
+  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+  if (android_build_id.size() > 0) {
+    if (!semicolon_inserted) {
+      android_info_str += ";";
+    }
+    android_info_str += " Build/" + android_build_id;
+  }
+#endif
+
   base::StringAppendF(
       &os_cpu,
 #if defined(OS_WIN)
       "Windows NT %d.%d%s",
       os_major_version,
       os_minor_version,
       architecture_token.c_str()
 #elif defined(OS_MACOSX)
       "Intel Mac OS X %d_%d_%d",
       os_major_version,
       os_minor_version,
       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()
+      "Android %d.%d.%d%s",
+      os_major_version,
+      os_minor_version,
+      os_bugfix_version,
+      android_info_str.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