diff options
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/html_util_unittests.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 9d59106..17589c0 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -20,11 +20,12 @@ #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/webkit_glue.h" +#include "webkit/glue/user_agent.h" const char kChromeFrameUserAgent[] = "chromeframe"; @@ -403,11 +404,15 @@ TEST_F(HtmlUtilUnittest, GetDefaultUserAgentHeaderWithCFTag) { } TEST_F(HtmlUtilUnittest, GetChromeUserAgent) { - std::string chrome_ua; - chrome_ua = webkit_glue::BuildUserAgent(false); - EXPECT_FALSE(chrome_ua.empty()); + // 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)); + const char* ua = http_utils::GetChromeUserAgent(); - EXPECT_EQ(0, chrome_ua.compare(ua)); + EXPECT_EQ(ua, chrome_ua); } TEST_F(HtmlUtilUnittest, GetDefaultUserAgent) { |