Move user_agent code from webkit/ to content/.

content/shell/common/shell_content_client.cc

Index: content/shell/common/shell_content_client.cc
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index 55f62ddd9425e984fd99d1bccbd8ab7ad05ebf22..f3bfc520669d90cc3667b4926df04f65d27aae64 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -8,13 +8,13 @@
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/user_agent.h"
 #include "content/shell/common/shell_switches.h"
 #include "grit/shell_resources.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/common/user_agent/user_agent_util.h"
 
 namespace content {
 
@@ -26,7 +26,7 @@ std::string ShellContentClient::GetUserAgent() const {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUseMobileUserAgent))
     product += " Mobile";
-  return webkit_glue::BuildUserAgentFromProduct(product);
+  return BuildUserAgentFromProduct(product);
 }
 
 base::string16 ShellContentClient::GetLocalizedString(int message_id) const {