Revert "Remove webkit_glue::BuildUserAgent(), change the contract in webkit_glue"

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index df93c37faa0850c54ddef9a38cb1d0c2e3376b80..4d8c9b03edfc83789af3fda27f1acf9352cf16ea 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -146,7 +146,6 @@ TestShell::TestShell()
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
-    webkit_glue::SetUserAgent("TestShell", false);
 }
 
 TestShell::~TestShell() {
@@ -636,6 +635,10 @@ bool IsProtocolSupportedForMedia(const GURL& url) {
   return false;
 }
 
+std::string BuildUserAgent(bool mimic_windows) {
+  return webkit_glue::BuildUserAgentHelper(mimic_windows, "Chrome/0.0.0.0");
+}
+
 #if defined(OS_LINUX)
 int MatchFontWithFallback(const std::string& face, bool bold,
                           bool italic, int charset) {