Fix the ChromeFrame BeginningTransaction unit test failures which validate th...

chrome_frame/test/http_negotiate_unittest.cc

 // 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 <atlbase.h>
 #include <atlcom.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
@@ skipping 52 matching lines @@
       reinterpret_cast<IHttpNegotiate_BeginningTransaction_Fn>(
           (*reinterpret_cast<void***>(
               static_cast<IHttpNegotiate*>(
                   &test_http)))[kBeginningTransactionIndex]);
 
   std::wstring cf_ua(
       ASCIIToWide(http_utils::GetDefaultUserAgentHeaderWithCFTag()));
   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_;
     const std::wstring delegate_additional_;
     const std::wstring expected_additional_;
     HRESULT delegate_return_value_;
   } test_cases[] = {
     { L"Accept: */*\r\n",
       L"",
       cf_ua + L"\r\n",
@@ skipping 125 matching lines @@
 
   // Check additional headers are preserved.
   EXPECT_THAT(AppendCFUserAgentString(NULL,
             L"Authorization: A Zoo That I Ruin\r\n"
             L"User-Agent: Get a Nurse;\r\n"
             L"Accept-Language: Cleanup a Cat Egg\r\n"),
       AllOf(ContainsRegex("User-Agent: Get a Nurse; chromeframe.+\r\n"),
             HasSubstr("Authorization: A Zoo That I Ruin\r\n"),
             HasSubstr("Accept-Language: Cleanup a Cat Egg\r\n")));
 }