Move user_agent code from webkit/ to content/.

content/test/webkit_support.cc

Index: content/test/webkit_support.cc
diff --git a/content/test/webkit_support.cc b/content/test/webkit_support.cc
index 18380c8f501723376d4bfc84a00f5a5a0bc56f6a..48b031fcec776b38579977f995ff1276e630477d 100644
--- a/content/test/webkit_support.cc
+++ b/content/test/webkit_support.cc
@@ -12,14 +12,14 @@
 #include "base/run_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/user_agent.h"
+#include "content/public/common/user_agent_util.h"
 #include "content/test/test_webkit_platform_support.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_util.h"
-#include "webkit/common/user_agent/user_agent.h"
-#include "webkit/common/user_agent/user_agent_util.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -110,8 +110,7 @@ void SetUpTestEnvironmentForUnitTests() {
   // at same time.
   url_util::Initialize();
   test_environment = new TestEnvironment;
-  webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
-      "DumpRenderTree/0.0.0.0"), false);
+  SetUserAgent(BuildUserAgentFromProduct("DumpRenderTree/0.0.0.0"), false);
 }
 
 void TearDownTestEnvironment() {