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

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 42054fbe1133f22258369174f62ce6d781047f88..760a266d034ee21be0dd9f70d50d19427472245e 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -300,18 +300,12 @@ bool ChromeContentClient::CanHandleWhileSwappedOut(
   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 {