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

chrome/common/chrome_content_client.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.
 
 #include "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 282 matching lines @@
   // swapped out renderers.
   switch (msg.type()) {
     case ChromeViewHostMsg_Snapshot::ID:
       return true;
     default:
       break;
   }
   return false;
 }
 
-std::string ChromeContentClient::GetUserAgent(bool* overriding) const {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
-    *overriding = true;
-    return CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kUserAgent);
-  } else {
-    *overriding = false;
-    chrome::VersionInfo version_info;
-    std::string product("Chrome/");
-    product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
-    return webkit_glue::BuildUserAgentFromProduct(product);
-  }
+std::string ChromeContentClient::GetUserAgent(bool mimic_windows) const {
+  chrome::VersionInfo version_info;
+  std::string product("Chrome/");
+  product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
+
+  return webkit_glue::BuildUserAgentHelper(mimic_windows, product);
 }
 
 string16 ChromeContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece ChromeContentClient::GetDataResource(int resource_id) const {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }
 
@@ skipping 51 matching lines @@
     policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
     policy->SetTokenLevel(
         sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
   }
 
   return true;
 }
 #endif
 
 }  // namespace chrome