Move user_agent code from webkit/ to content/.

content/common/user_agent_ios.mm

Index: content/common/user_agent_ios.mm
diff --git a/webkit/common/user_agent/user_agent_util_ios.mm b/content/common/user_agent_ios.mm
similarity index 88%
rename from webkit/common/user_agent/user_agent_util_ios.mm
rename to content/common/user_agent_ios.mm
index 6a42c5133a022ed93d18d7d418c2db9659466694..ef8c298b244c12cc417ccba5c6dbccc6af305421 100644
--- a/webkit/common/user_agent/user_agent_util_ios.mm
+++ b/content/common/user_agent_ios.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/common/user_agent/user_agent_util.h"
+#include "content/public/common/user_agent.h"
 
 #import <UIKit/UIKit.h>
 
@@ -59,7 +59,7 @@ const UAVersions& GetUAVersionsForCurrentOS() {
 
 }  // namespace
 
-namespace webkit_glue {
+namespace content {
 
 std::string BuildOSCpuInfo() {
   int32 os_major_version = 0;
@@ -114,17 +114,16 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
   UAVersions ua_versions = GetUAVersionsForCurrentOS();
 
   std::string user_agent;
-  base::StringAppendF(
-      &user_agent,
-      "Mozilla/5.0 (%s) AppleWebKit/%s"
-      " (KHTML, like Gecko) %s Mobile/%s Safari/%s",
-      webkit_glue::BuildOSCpuInfo().c_str(),
-      ua_versions.webkit_version_string,
-      product.c_str(),
-      kernel_version,
-      ua_versions.safari_version_string);
+  base::StringAppendF(&user_agent,
+                      "Mozilla/5.0 (%s) AppleWebKit/%s"
+                      " (KHTML, like Gecko) %s Mobile/%s Safari/%s",
+                      BuildOSCpuInfo().c_str(),
+                      ua_versions.webkit_version_string,
+                      product.c_str(),
+                      kernel_version,
+                      ua_versions.safari_version_string);
 
   return user_agent;
 }
 
-}  // namespace webkit_glue
+}  // namespace content