Move user_agent code from webkit/ to content/.

content/public/common/content_client.cc

Index: content/public/common/content_client.cc
diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc
index 54db51778a46c3fd524de5c5257dff08f8378609..dfd78d787afa49e069164707159668d45b625572 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "ui/gfx/image/image.h"
-#include "webkit/common/user_agent/user_agent.h"
 
 namespace content {
 
@@ -36,13 +35,6 @@ class InternalTestInitializer {
 
 void SetContentClient(ContentClient* client) {
   g_client = client;
-
-  // Set the default user agent as provided by the client. We need to make
-  // sure this is done before webkit_glue::GetUserAgent() is called (so that
-  // the UA doesn't change).
-  if (client) {
-    webkit_glue::SetUserAgent(client->GetUserAgent(), false);
-  }
 }
 
 ContentClient* GetContentClient() {
@@ -61,11 +53,6 @@ ContentUtilityClient* SetUtilityClientForTesting(ContentUtilityClient* u) {
   return InternalTestInitializer::SetUtility(u);
 }
 
-const std::string& GetUserAgent(const GURL& url) {
-  DCHECK(g_client);
-  return webkit_glue::GetUserAgent(url);
-}
-
 ContentClient::ContentClient()
     : browser_(NULL), plugin_(NULL), renderer_(NULL), utility_(NULL) {
 }