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

There are some browser_tests failures on the buildbots that don't reproduce locally. Reverting while I investigate.

> Simplify the user agent code some more since after r255534 it's not affected by the site's URL.
> 
> Code in content always gets it now from ContentClient::GetUserAgent. In Chrome, there's a GetUserAgent function which returns it.
> 
> BUG=338338
> R=isherman@chromium.org, pauljensen@chromium.org, scottmg@chromium.org, tfarina@chromium.org
> 
> Review URL: https://codereview.chromium.org/191093002

TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/192283002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255867 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 6 deletions

diff --git a/net/url_request/http_user_agent_settings.h b/net/url_request/http_user_agent_settings.h
index 40eb1a6..d475a88 100644
--- a/net/url_request/http_user_agent_settings.h
+++ b/net/url_request/http_user_agent_settings.h
@@ -24,8 +24,9 @@ class NET_EXPORT HttpUserAgentSettings {
   // Gets the value of 'Accept-Language' header field.
   virtual std::string GetAcceptLanguage() const = 0;
 
-  // Gets the UA string.
-  virtual std::string GetUserAgent() const = 0;
+  // Gets the UA string to use for the given URL.  Pass an empty URL to get
+  // the default UA string.
+  virtual std::string GetUserAgent(const GURL& url) const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpUserAgentSettings);
diff --git a/net/url_request/static_http_user_agent_settings.cc b/net/url_request/static_http_user_agent_settings.cc
index dd74f96..1fd1992 100644
--- a/net/url_request/static_http_user_agent_settings.cc
+++ b/net/url_request/static_http_user_agent_settings.cc
@@ -20,7 +20,7 @@ std::string StaticHttpUserAgentSettings::GetAcceptLanguage() const {
   return accept_language_;
 }
 
-std::string StaticHttpUserAgentSettings::GetUserAgent() const {
+std::string StaticHttpUserAgentSettings::GetUserAgent(const GURL& url) const {
   return user_agent_;
 }
 
diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
index 7406abc..8819daa 100644
--- a/net/url_request/static_http_user_agent_settings.h
+++ b/net/url_request/static_http_user_agent_settings.h
@@ -24,7 +24,7 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings {
 
   // HttpUserAgentSettings implementation
   virtual std::string GetAcceptLanguage() const OVERRIDE;
-  virtual std::string GetUserAgent() const OVERRIDE;
+  virtual std::string GetUserAgent(const GURL& url) const OVERRIDE;
 
  private:
   const std::string accept_language_;
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 3bedc3d..947686c 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -270,7 +270,8 @@ void URLRequestHttpJob::Start() {
   request_info_.extra_headers.SetHeaderIfMissing(
       HttpRequestHeaders::kUserAgent,
       http_user_agent_settings_ ?
-          http_user_agent_settings_->GetUserAgent() : std::string());
+          http_user_agent_settings_->GetUserAgent(request_->url()) :
+          std::string());
 
   AddExtraHeaders();
   AddCookieHeaderAndStart();
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 68507f8..452e7e0 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -5923,7 +5923,7 @@ TEST_F(URLRequestTestHTTP, DefaultUserAgent) {
                  &default_context_);
   req.Start();
   base::RunLoop().Run();
-  EXPECT_EQ(req.context()->http_user_agent_settings()->GetUserAgent(),
+  EXPECT_EQ(req.context()->http_user_agent_settings()->GetUserAgent(req.url()),
             d.data_received());
 }