Move user_agent code from webkit/ to content/.

content/common/user_agent_ios.mm

 // Copyright 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/common/user_agent/user_agent_util.h"
+#include "content/public/common/user_agent.h"
 
 #import <UIKit/UIKit.h>
 
 #include <sys/sysctl.h>
 #include <string>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 36 matching lines @@
         (os_major_version == version_map[i].major_os_version &&
          os_minor_version >= version_map[i].minor_os_version))
       return version_map[i].ua_versions;
   }
   NOTREACHED();
   return version_map[arraysize(version_map) - 1].ua_versions;
 }
 
 }  // namespace
 
-namespace webkit_glue {
+namespace content {
 
 std::string BuildOSCpuInfo() {
   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);
   std::string os_version;
   if (os_bugfix_version == 0) {
@@ skipping 34 matching lines @@
   unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
   size_t bufferSize = 0;
   sysctl(mib, namelen, NULL, &bufferSize, NULL, 0);
   char kernel_version[bufferSize];
   int result = sysctl(mib, namelen, kernel_version, &bufferSize, NULL, 0);
   DCHECK(result == 0);
 
   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