Merge 179932 - Ensure that ChromeFrame does not interfere with non ChromeFrame requests initiated b…

chrome_frame/protocol_sink_wrap.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_FRAME_PROTOCOL_SINK_WRAP_H_
 #define CHROME_FRAME_PROTOCOL_SINK_WRAP_H_
 
 #include <exdisp.h>
 #include <urlmon.h>
 #include <atlbase.h>
@@ skipping 22 matching lines @@
     IInternetProtocol* this_object, void* buffer, ULONG size,
     ULONG* size_read);
 typedef HRESULT (STDMETHODCALLTYPE* InternetProtocol_StartEx_Fn)(
     IInternetProtocolEx* this_object, IUri* uri,
     IInternetProtocolSink* prot_sink, IInternetBindInfo* bind_info,
     DWORD flags, HANDLE_PTR reserved);
 typedef HRESULT (STDMETHODCALLTYPE* InternetProtocol_LockRequest_Fn)(
     IInternetProtocol* this_object, DWORD options);
 typedef HRESULT (STDMETHODCALLTYPE* InternetProtocol_UnlockRequest_Fn)(
     IInternetProtocol* this_object);
-
+typedef HRESULT (STDMETHODCALLTYPE* InternetProtocol_Abort_Fn)(
+    IInternetProtocol* this_object,  HRESULT hr, DWORD options);
+typedef HRESULT (STDMETHODCALLTYPE* InternetProtocol_Terminate_Fn)(
+    IInternetProtocol* this_object, DWORD options);
 
 class ProtData;
 
 // A class to wrap protocol sink in IInternetProtocol::Start[Ex] for
 // HTTP and HTTPS protocols.
 //
 // This is an alternative to a mime filter and we have to do this in order
 // to inspect initial portion of HTML for 'chrome' meta tag and report
 // a different mime type in that case.
 //
@@ skipping 120 matching lines @@
 };
 
 struct TransactionHooks {
   void InstallHooks();
   void RevertHooks();
 };
 
 DECLSPEC_SELECTANY struct TransactionHooks g_trans_hooks;
 
 #endif  // CHROME_FRAME_PROTOCOL_SINK_WRAP_H_