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

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 128 matching lines @@
     delegate_.reset(new TestWebViewDelegate(this));
     popup_delegate_.reset(new TestWebViewDelegate(this));
     layout_test_controller_.reset(new LayoutTestController(this));
     navigation_controller_.reset(new TestNavigationController(this));
     notification_presenter_.reset(new TestNotificationPresenter(this));
 
     net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
-    webkit_glue::SetUserAgent("TestShell", false);
 }
 
 TestShell::~TestShell() {
   delegate_->RevokeDragDrop();
 
   // DevTools frontend page is supposed to be navigated only once and
   // loading another URL in that Page is an error.
   if (!dev_tools_client_.get()) {
     // Navigate to an empty page to fire all the destruction logic for the
     // current page.
@@ skipping 469 matching lines @@
 
 bool IsProtocolSupportedForMedia(const GURL& url) {
   if (url.SchemeIsFile() ||
       url.SchemeIs("http") ||
       url.SchemeIs("https") ||
       url.SchemeIs("data"))
     return true;
   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) {
   return -1;
 }
 
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length) {
   return false;
 }
@@ skipping 15 matching lines @@
     webkit::WebPluginInfo plugin_info = plugins->at(i);
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue