Move Android user agent generation to native code

webkit/glue/user_agent.h

Index: webkit/glue/user_agent.h
diff --git a/webkit/glue/user_agent.h b/webkit/glue/user_agent.h
index 60f6e53b7632dca4fe1808e6f174c2244b629846..f371f41ffe6a7b36284085db3fbf604e097a3704 100644
--- a/webkit/glue/user_agent.h
+++ b/webkit/glue/user_agent.h
@@ -14,6 +14,11 @@ namespace webkit_glue {
 // Builds a User-agent compatible string that describes the OS and CPU type.
 std::string BuildOSCpuInfo();
 
+// Builds a User-agent compatible string that describes the Android build being
+// used.  If no information is available, returns a spoofed string pointing to
+// the latest publicly available version of Android.
+std::string BuildOSCpuInfoForAndroid();

[jamesr, 2012/08/15 21:07:50]

why is this publicly exposed as a separate entry point from BuildOSCpuInfo()? 
If you're on android, obviously this will return you the android OS/Cpu info. 
If you aren't on android, then this function isn't of any immediate use
(obviously somebody will want to add spoofing support in the future, but that's
different).

+
 // Returns the WebKit version, in the form "major.minor (branch@revision)".
 std::string GetWebKitVersion();
 
@@ -21,13 +26,6 @@ std::string GetWebKitVersion();
 int GetWebKitMajorVersion();
 int GetWebKitMinorVersion();
 
-#if defined(OS_ANDROID)
-// Sets the OS component of the user agent (e.g. "4.0.4; Galaxy Nexus
-// BUILD/IMM76K")
-// TODO(yfriedman): Remove this ASAP (http://crbug.com/131312)
-void SetUserAgentOSInfo(const std::string& os_info);
-#endif
-
 // Helper function to generate a full user agent string from a short
 // product name.
 std::string BuildUserAgentFromProduct(const std::string& product);