Move user_agent code from webkit/ to content/.

android_webview/common/aw_content_client.cc

Index: android_webview/common/aw_content_client.cc
diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
index e91faa98d4240cb1dac9d224f9d301eaccf423c5..0de419dc918247022080d00ee5eb6e3cca8813e6 100644
--- a/android_webview/common/aw_content_client.cc
+++ b/android_webview/common/aw_content_client.cc
@@ -7,10 +7,10 @@
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/user_agent_util.h"
 #include "ipc/ipc_message.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 android_webview {
 
@@ -28,7 +28,7 @@ std::string AwContentClient::GetUserAgent() const {
         switches::kUseMobileUserAgent)) {
     product += " Mobile";
   }
-  return webkit_glue::BuildUserAgentFromProduct(product);
+  return content::BuildUserAgentFromProduct(product);
 }
 
 base::string16 AwContentClient::GetLocalizedString(int message_id) const {