diff options
| author | Steve Block <steveblock@google.com> | 2010-10-20 11:56:07 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-20 14:37:31 +0100 |
| commit | 47f23f1d4fa00e9ca3acc75e22213816e83f44d7 (patch) | |
| tree | b4a3d2923d1dd85543fa8e441b969db874a0b740 /WebKit/android | |
| parent | 4f402dad5494b7887490b93f21ed5ffe94955a6b (diff) | |
| download | external_webkit-47f23f1d4fa00e9ca3acc75e22213816e83f44d7.zip external_webkit-47f23f1d4fa00e9ca3acc75e22213816e83f44d7.tar.gz external_webkit-47f23f1d4fa00e9ca3acc75e22213816e83f44d7.tar.bz2 | |
Removes the unused default userAgent from WebRequestContext
Bug: 3035160
Change-Id: Iaf163ea571f5d9811b5d14f83e5b02948748ff84
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 300d5b2..b2a81c9 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -39,7 +39,9 @@ #include <wtf/Threading.h> namespace { -std::string userAgent("Mozilla/5.0 (Linux; U; Android 2.1; en-gb; Nexus One Build/ERE21) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17"); +// TODO: The userAgent should not be a static, as it can be set per WebView. +// http://b/3113804 +std::string userAgent(""); std::string acceptLanguage(""); Lock userAgentLock; @@ -76,6 +78,7 @@ void WebRequestContext::SetUserAgent(WTF::String string) const std::string& WebRequestContext::GetUserAgent(const GURL& url) const { AutoLock aLock(userAgentLock); + ASSERT(userAgent != ""); return userAgent; } |