Implement HTTP headers sniffing in the ProtocolSinkWrap, instead of relying o...

chrome_frame/http_negotiate.cc

 // Copyright (c) 2009 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/http_negotiate.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <htiframe.h>
 
@@ skipping 155 matching lines @@
 
   if (http) {
     hr = vtable_patch::PatchInterfaceMethods(http, IHttpNegotiate_PatchInfo);
     DLOG_IF(ERROR, FAILED(hr))
         << StringPrintf("HttpNegotiate patch failed 0x%08X", hr);
   } else {
     DLOG(WARNING)
         << StringPrintf("IHttpNegotiate not supported 0x%08X", hr);
   }
 
-  ScopedComPtr<IBindStatusCallback> bscb;
-  hr = bscb.QueryFrom(to_patch);
+  // CTransaction patch supports sniffing HTTP headers, so no need of
+  // sniffing inside HttpNegotiatePatch::ReportProgress.
+  if (GetPatchMethod() != PATCH_METHOD_INET_PROTOCOL) {
+    ScopedComPtr<IBindStatusCallback> bscb;
+    hr = bscb.QueryFrom(to_patch);
 
-  if (bscb) {
-    hr = vtable_patch::PatchInterfaceMethods(bscb,
-                                             IBindStatusCallback_PatchInfo);
-    DLOG_IF(ERROR, FAILED(hr))
-        << StringPrintf("BindStatusCallback patch failed 0x%08X", hr);
-  } else {
-    DLOG(WARNING) << StringPrintf("IBindStatusCallback not supported 0x%08X",
-                                  hr);
+    if (bscb) {
+      hr = vtable_patch::PatchInterfaceMethods(bscb,
+                                               IBindStatusCallback_PatchInfo);
+      DLOG_IF(ERROR, FAILED(hr))
+          << StringPrintf("BindStatusCallback patch failed 0x%08X", hr);
+    } else {
+      DLOG(WARNING) << StringPrintf("IBindStatusCallback not supported 0x%08X",
+                                    hr);
+    }
   }
   return hr;
 }
 
 // static
 HRESULT HttpNegotiatePatch::BeginningTransaction(
     IHttpNegotiate_BeginningTransaction_Fn original, IHttpNegotiate* me,
     LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR* additional_headers) {
   DLOG(INFO) << __FUNCTION__ << " " << url << " headers:\n" << headers;
 
@@ skipping 200 matching lines @@
     // Note that this avoids having the VEH report a crash if an SEH earlier in
     // the chain handles the exception.
     ExceptionBarrier barrier;
     return original(me, status_code, status_text);
   } else {
     // Only report exceptions caused within ChromeFrame in this context.
     ExceptionBarrierReportOnlyModule barrier;
     return original(me, status_code, status_text);
   }
 }