diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 20:10:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 20:10:41 +0000 |
| commit | 69078b8d2c607abde0fdedb08930598438e25f5f (patch) | |
| tree | 16369fd439f1630837aa767cc4ce5ceb8f31f233 /android_webview/browser | |
| parent | 8a820c8276581a82f263c7e3603ab4bc73a221db (diff) | |
| download | chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.zip chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.gz chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.bz2 | |
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
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index 38c70a2..2ee7525 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -11,7 +11,6 @@ #include "android_webview/browser/net/aw_network_delegate.h" #include "android_webview/browser/net/aw_url_request_job_factory.h" #include "android_webview/browser/net/init_native_callback.h" -#include "android_webview/common/aw_content_client.h" #include "android_webview/common/aw_switches.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" @@ -178,7 +177,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() { DCHECK(!url_request_context_); net::URLRequestContextBuilder builder; - builder.set_user_agent(GetUserAgent()); + builder.set_user_agent(content::GetUserAgent(GURL())); builder.set_network_delegate(new AwNetworkDelegate()); #if !defined(DISABLE_FTP_SUPPORT) builder.set_ftp_enabled(false); // Android WebView does not support ftp yet. |