Move user_agent code from webkit/ to content/.

content/public/common/user_agent_util.h

Index: content/public/common/user_agent_util.h
diff --git a/webkit/common/user_agent/user_agent_util.h b/content/public/common/user_agent_util.h
similarity index 49%
rename from webkit/common/user_agent/user_agent_util.h
rename to content/public/common/user_agent_util.h
index e23b809a5050fe1e5fae2a6b1be1f4c440f61f1e..25fac4a018c63e9536e6934adf358c63ce39630f 100644
--- a/webkit/common/user_agent/user_agent_util.h
+++ b/content/public/common/user_agent_util.h
@@ -2,39 +2,36 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_
-#define WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_
+#ifndef CONTENT_PUBLIC_COMMON_USER_AGENT_UTIL_H_
+#define CONTENT_PUBLIC_COMMON_USER_AGENT_UTIL_H_
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "webkit/common/user_agent/webkit_user_agent_export.h"
-
-namespace webkit_glue {
+namespace content {
 
 // Builds a User-agent compatible string that describes the OS and CPU type.
-WEBKIT_USER_AGENT_EXPORT std::string BuildOSCpuInfo();
+CONTENT_EXPORT std::string BuildOSCpuInfo();

[jam, 2014/03/04 20:49:45]

no need to have user_agent.h and user_agent_util.h. put these methods in
user_agent.h

[tfarina, 2014/03/04 22:07:20]

Done.

 
 // Returns the WebKit version, in the form "major.minor (branch@revision)".
-WEBKIT_USER_AGENT_EXPORT std::string GetWebKitVersion();
+CONTENT_EXPORT std::string GetWebKitVersion();
 
 // The following 2 functions return the major and minor webkit versions.
-WEBKIT_USER_AGENT_EXPORT int GetWebKitMajorVersion();
-WEBKIT_USER_AGENT_EXPORT int GetWebKitMinorVersion();
+CONTENT_EXPORT int GetWebKitMajorVersion();
+CONTENT_EXPORT int GetWebKitMinorVersion();
 
-WEBKIT_USER_AGENT_EXPORT std::string GetWebKitRevision();
+CONTENT_EXPORT std::string GetWebKitRevision();
 
 // Helper function to generate a full user agent string from a short
 // product name.
-WEBKIT_USER_AGENT_EXPORT std::string BuildUserAgentFromProduct(
+CONTENT_EXPORT std::string BuildUserAgentFromProduct(
     const std::string& product);
 
 // Builds a full user agent string given a string describing the OS and a
 // product name.
-WEBKIT_USER_AGENT_EXPORT std::string BuildUserAgentFromOSAndProduct(
+CONTENT_EXPORT std::string BuildUserAgentFromOSAndProduct(
     const std::string& os_info,
     const std::string& product);
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_
+#endif  // CONTENT_PUBLIC_COMMON_USER_AGENT_UTIL_H_