Revert 255858 "Simplify the user agent code some more since afte..."

trunk/src/chrome/browser/ui/webui/help/help_handler.cc

Index: trunk/src/chrome/browser/ui/webui/help/help_handler.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/help/help_handler.cc	(revision 255866)
+++ trunk/src/chrome/browser/ui/webui/help/help_handler.cc	(working copy)
@@ -21,7 +21,6 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
-#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -29,6 +28,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "content/public/common/content_client.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
@@ -280,7 +280,7 @@
   source->AddString("jsEngine", "V8");
   source->AddString("jsEngineVersion", v8::V8::GetVersion());
 
-  source->AddString("userAgentInfo", GetUserAgent());
+  source->AddString("userAgentInfo", content::GetUserAgent(GURL()));
 
   CommandLine::StringType command_line =
       CommandLine::ForCurrentProcess()->GetCommandLineString();