Move user_agent code from webkit/ to content/.

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 1846435082125f53e9e0e697e39b58afbe9c1cfc..fa487c30661064fefca3a2fccdf94ef193dc8297 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -41,6 +41,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
+#include "content/public/common/user_agent.h"
 #include "content/renderer/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
 #include "crypto/nss_util.h"
@@ -50,7 +51,6 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/win/dpi.h"
-#include "webkit/common/user_agent/user_agent.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
@@ -383,8 +383,7 @@ int RunZygote(const MainFunctionParams& main_function_params,
   // to (re)set it now, rather than using the default one the zygote
   // initialized.
   if (command_line.HasSwitch(switches::kUserAgent)) {
-    webkit_glue::SetUserAgent(
-        command_line.GetSwitchValueASCII(switches::kUserAgent), true);
+    SetUserAgent(command_line.GetSwitchValueASCII(switches::kUserAgent), true);
   }
 
   // The StatsTable must be initialized in each process; we already
@@ -742,11 +741,11 @@ class ContentMainRunnerImpl : public ContentMainRunner {
       delegate->PreSandboxStartup();
 
     // Set any custom user agent passed on the command line now so the string
-    // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it
+    // doesn't change between calls to GetUserAgent(), otherwise it
     // defaults to the user agent set during SetContentClient().
     if (command_line.HasSwitch(switches::kUserAgent)) {
-      webkit_glue::SetUserAgent(
-          command_line.GetSwitchValueASCII(switches::kUserAgent), true);
+      SetUserAgent(command_line.GetSwitchValueASCII(switches::kUserAgent),
+                   true);
     }
 
     if (!process_type.empty())