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

trunk/src/chrome/browser/net/chrome_http_user_agent_settings.cc

Index: trunk/src/chrome/browser/net/chrome_http_user_agent_settings.cc
===================================================================
--- trunk/src/chrome/browser/net/chrome_http_user_agent_settings.cc	(revision 255866)
+++ trunk/src/chrome/browser/net/chrome_http_user_agent_settings.cc	(working copy)
@@ -5,9 +5,9 @@
 #include "chrome/browser/net/chrome_http_user_agent_settings.h"
 
 #include "base/prefs/pref_service.h"
-#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_client.h"
 #include "net/http/http_util.h"
 
 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) {
@@ -41,8 +41,8 @@
   return last_http_accept_language_;
 }
 
-std::string ChromeHttpUserAgentSettings::GetUserAgent() const {
+std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return ::GetUserAgent();
+  return content::GetUserAgent(url);
 }