From 92f132ae9e06a0f55d65b44a324ac74b53a2945d Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Sat, 18 Dec 2010 00:11:21 +0000 Subject: [PATCH] Fix the ChromeFrame BeginningTransaction unit test failures which validate the HttpNegotiate patch. On IE6/7/8 the chrome frame user agent is added to the ua section in the registry. This causes the test matcher to fail as the actual UA string contains the string chromeframe followed by the version of the dll. Fix is to reduce the scope of the matcher to just look for the string chromeframe. BUG=none TEST=Covered by existing chrome frame BeginningTransaction test. TBR=amit Review URL: http://codereview.chromium.org/6045001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69591 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/test/http_negotiate_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc index c56034b59dcfe..d63b79b8c9d0e 100644 --- a/chrome_frame/test/http_negotiate_unittest.cc +++ b/chrome_frame/test/http_negotiate_unittest.cc @@ -70,7 +70,7 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) { std::wstring cf_tag( ASCIIToWide(http_utils::GetChromeFrameUserAgent())); - EXPECT_NE(std::wstring::npos, cf_ua.find(cf_tag)); + EXPECT_NE(std::wstring::npos, cf_ua.find(L"chromeframe/")); struct TestCase { const std::wstring original_headers_; -- GitLab