Implement HTTP headers sniffing in the ProtocolSinkWrap, instead of relying on IHttpNegotiate patch.

Moved some code based on over-conservative assumptions to execute earlier in pipeline.
Will prevent BUG=38480 to manifest itself.
BUG=47879

Review URL: http://codereview.chromium.org/2987001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52337 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 11 deletions

diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc
index 87dc65c5..30d7961 100644
--- a/chrome_frame/http_negotiate.cc
+++ b/chrome_frame/http_negotiate.cc
@@ -173,17 +173,21 @@ HRESULT HttpNegotiatePatch::PatchHttpNegotiate(IUnknown* to_patch) {
         << StringPrintf("IHttpNegotiate not supported 0x%08X", hr);
   }
 
-  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);
+  // 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);
+    }
   }
   return hr;
 }