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

chrome_frame/test/html_util_unittests.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 <windows.h>
 #include <atlsecurity.h>
 #include <shellapi.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_handle.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
 
 #include "chrome/browser/automation/url_request_automation_job.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_delegate.h"
 #include "chrome_frame/html_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/user_agent.h"
+#include "webkit/glue/webkit_glue.h"
 
 const char kChromeFrameUserAgent[] = "chromeframe";
 
 class HtmlUtilUnittest : public testing::Test {
  protected:
   // Constructor
   HtmlUtilUnittest() {}
 
   // Returns the test path given a test case.
   virtual bool GetTestPath(const std::string& test_case, FilePath* path) {
@@ skipping 358 matching lines @@
 }
 
 TEST_F(HtmlUtilUnittest, GetDefaultUserAgentHeaderWithCFTag) {
   std::string ua(http_utils::GetDefaultUserAgentHeaderWithCFTag());
   EXPECT_NE(0u, ua.length());
   EXPECT_NE(std::string::npos, ua.find("Mozilla"));
   EXPECT_NE(std::string::npos, ua.find(kChromeFrameUserAgent));
 }
 
 TEST_F(HtmlUtilUnittest, GetChromeUserAgent) {
-  // This code is duplicated from chrome_content_client.cc to avoid
-  // introducing a link-time dependency on chrome_common.
-  chrome::VersionInfo version_info;
-  std::string product("Chrome/");
-  product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
-  std::string chrome_ua(webkit_glue::BuildUserAgentFromProduct(product));
-
+  std::string chrome_ua;
+  chrome_ua = webkit_glue::BuildUserAgent(false);
+  EXPECT_FALSE(chrome_ua.empty());
   const char* ua = http_utils::GetChromeUserAgent();
-  EXPECT_EQ(ua, chrome_ua);
+  EXPECT_EQ(0, chrome_ua.compare(ua));
 }
 
 TEST_F(HtmlUtilUnittest, GetDefaultUserAgent) {
   std::string ua(http_utils::GetDefaultUserAgent());
   EXPECT_NE(0u, ua.length());
   EXPECT_NE(std::string::npos, ua.find("Mozilla"));
 }
 
 TEST_F(HtmlUtilUnittest, GetChromeFrameUserAgent) {
   const char* call1 = http_utils::GetChromeFrameUserAgent();
@@ skipping 53 matching lines @@
     "Content-Length: 42\r\n"
     "X-Frame-Options: SAMEORIGIN\r\n"));
   EXPECT_TRUE(http_utils::HasFrameBustingHeader(
     "X-Frame-Options: deny\r\n"
     "X-Frame-Options: ALLOWall\r\n"
     "Content-Length: 42\r\n"));
   EXPECT_TRUE(http_utils::HasFrameBustingHeader(
     "X-Frame-Options: SAMEORIGIN\r\n"
     "X-Frame-Options: ALLOWall\r\n"));
 }