| Index: content/common/user_agent_util.cc
|
| diff --git a/webkit/common/user_agent/user_agent_util.cc b/content/common/user_agent_util.cc
|
| similarity index 95%
|
| rename from webkit/common/user_agent/user_agent_util.cc
|
| rename to content/common/user_agent_util.cc
|
| index 35e20162e68af1c299f0433b95efbcb305a87c51..80975aac543ca381a08e2657a5513122c6cff979 100644
|
| --- a/webkit/common/user_agent/user_agent_util.cc
|
| +++ b/content/common/user_agent_util.cc
|
| @@ -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_util.h"
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| #include <sys/utsname.h>
|
| @@ -20,7 +20,7 @@
|
| // Generated
|
| #include "webkit_version.h" // NOLINT
|
|
|
| -namespace webkit_glue {
|
| +namespace content {
|
|
|
| std::string GetWebKitVersion() {
|
| return base::StringPrintf("%d.%d (%s)",
|
| @@ -166,8 +166,8 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
|
| #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);
|
| }
|
|
|
| @@ -189,4 +189,4 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
|
| return user_agent;
|
| }
|
|
|
| -} // namespace webkit_glue
|
| +} // namespace content
|
|
|