Move user_agent code from webkit/ to content/.

content/common/user_agent.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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"
+
+#include "base/logging.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
+#include "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
-#include "base/lazy_instance.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "base/sys_info.h"
-
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Generated
 #include "webkit_version.h"  // NOLINT
 
-namespace webkit_glue {
+namespace content {
+
+namespace {
+
+#if defined(OS_ANDROID)
+std::string GetAndroidDeviceName() {
+  return base::SysInfo::GetDeviceName();
+}
+#endif
+
+}  // namespace
 
 std::string GetWebKitVersion() {
   return base::StringPrintf("%d.%d (%s)",
                             WEBKIT_VERSION_MAJOR,
                             WEBKIT_VERSION_MINOR,
                             WEBKIT_SVN_REVISION);
 }
 
+int GetWebKitMajorVersion() {
+  return WEBKIT_VERSION_MAJOR;
+}
+
+int GetWebKitMinorVersion() {
+  return WEBKIT_VERSION_MINOR;
+}
+
 std::string GetWebKitRevision() {
   return WEBKIT_SVN_REVISION;
 }
 
-#if defined(OS_ANDROID)
-std::string GetAndroidDeviceName() {
-  return base::SysInfo::GetDeviceName();
-}
-#endif
-
 std::string BuildOSCpuInfo() {
   std::string os_cpu;
 
 #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,
@@ skipping 84 matching lines @@
 #else
       "%s %s",
       unixinfo.sysname,  // e.g. Linux
       cputype.c_str()    // e.g. i686
 #endif
   );  // NOLINT
 
   return os_cpu;
 }
 
-int GetWebKitMajorVersion() {
-  return WEBKIT_VERSION_MAJOR;
-}
-
-int GetWebKitMinorVersion() {
-  return WEBKIT_VERSION_MINOR;
-}
-
 std::string BuildUserAgentFromProduct(const std::string& product) {
   const char kUserAgentPlatform[] =
 #if defined(OS_WIN)
       "";
 #elif defined(OS_MACOSX)
       "Macintosh; ";
 #elif defined(USE_X11)
       "X11; ";           // strange, but that's what Firefox uses
 #elif defined(OS_ANDROID)
       "Linux; ";
 #else
       "Unknown; ";
 #endif
 
   std::string os_info;
-  base::StringAppendF(&os_info, "%s%s", kUserAgentPlatform,
-                      webkit_glue::BuildOSCpuInfo().c_str());
+  base::StringAppendF(
+      &os_info, "%s%s", kUserAgentPlatform, BuildOSCpuInfo().c_str());
   return BuildUserAgentFromOSAndProduct(os_info, product);
 }
 
 std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
                                            const std::string& product) {
   // Derived from Safari's UA string.
   // This is done to expose our product name in a manner that is maximally
   // compatible with Safari, we hope!!
   std::string user_agent;
   base::StringAppendF(
       &user_agent,
       "Mozilla/5.0 (%s) AppleWebKit/%d.%d (KHTML, like Gecko) %s Safari/%d.%d",
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
-}  // namespace webkit_glue
+}  // namespace content