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

chrome_frame/html_utils.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_frame/html_utils.h"
 
 #include <atlbase.h>
 #include <urlmon.h>
 
 #include "base/string_util.h"
 #include "base/string_tokenizer.h"
@@ skipping 366 matching lines @@
   if (!g_chrome_user_agent[0]) {
     _pAtlModule->m_csStaticDataInitAndTypeInfo.Lock();
     if (!g_chrome_user_agent[0]) {
       std::string ua;
 
       chrome::VersionInfo version_info;
       std::string product("Chrome/");
       product += version_info.is_valid() ? version_info.Version()
                                          : "0.0.0.0";
 
-      ua = webkit_glue::BuildUserAgentFromProduct(product);
+      ua = webkit_glue::BuildUserAgentHelper(false, product);
 
       DCHECK(ua.length() < arraysize(g_chrome_user_agent));
       lstrcpynA(g_chrome_user_agent, ua.c_str(),
                 arraysize(g_chrome_user_agent) - 1);
     }
     _pAtlModule->m_csStaticDataInitAndTypeInfo.Unlock();
   }
   return g_chrome_user_agent;
 }
 
@@ skipping 38 matching lines @@
                                         const std::string& headers) {
   net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\r\n");
   while (it.GetNext()) {
     if (!lstrcmpiA(it.name().c_str(), header.c_str()))
       return std::string(it.values_begin(), it.values_end());
   }
   return std::string();
 }
 
 }  // namespace http_utils