summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 21:05:42 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 21:05:42 +0000
commitfb0902a919bb22f7c2002611abeeae37e0ac94ac (patch)
tree2ce52a2f72363ef130db46b6b6ce03eb76fd24ec /webkit
parent015ce6ebccb611b40e09c237042912840d2d1a4f (diff)
downloadchromium_src-fb0902a919bb22f7c2002611abeeae37e0ac94ac.zip
chromium_src-fb0902a919bb22f7c2002611abeeae37e0ac94ac.tar.gz
chromium_src-fb0902a919bb22f7c2002611abeeae37e0ac94ac.tar.bz2
fix DRT and TestShell to have a full user agent string again.
I regressed this in r102763. Should've run the layout try jobs :(. R=mihaip@chromium.org BUG=90442 TEST=layout bots pass fast/dom/navigator-userAgent.html,http/tests/misc/redirect.php,http/tests/navigation/useragent.php Review URL: http://codereview.chromium.org/8046017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/webkit_support.cc4
-rw-r--r--webkit/tools/test_shell/test_shell.cc3
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index d510520..08f853f 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -46,6 +46,7 @@
#include "webkit/appcache/web_application_cache_host_impl.h"
#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/webkit_constants.h"
+#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
#include "webkit/glue/webmediaplayer_impl.h"
@@ -264,7 +265,8 @@ static void SetUpTestEnvironmentImpl(bool unit_test_mode) {
// because on Linux, we need base::AtExitManager.
icu_util::Initialize();
}
- webkit_glue::SetUserAgent("DumpRenderTree", false);
+ webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
+ "DumpRenderTree/0.0.0.0"), false);
}
void SetUpTestEnvironment() {
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index df93c37..01862c5 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -146,7 +146,8 @@ TestShell::TestShell()
filter->AddHostnameHandler("test-shell-resource", "inspector",
&URLRequestTestShellFileJob::InspectorFactory);
url_util::AddStandardScheme("test-shell-resource");
- webkit_glue::SetUserAgent("TestShell", false);
+ webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
+ "TestShell/0.0.0.0"), false);
}
TestShell::~TestShell() {