A new way of hooking internet protocols.

chrome_frame/bho.cc

Index: chrome_frame/bho.cc
===================================================================
--- chrome_frame/bho.cc	(revision 48838)
+++ chrome_frame/bho.cc	(working copy)
@@ -123,8 +123,7 @@
   if (is_top_level) {
     set_url(url->bstrVal);
     set_referrer("");
-    // The moniker patch checks opt-in URLs in SniffData::DetermineRendererType.
-    if (!MonikerPatchEnabled()) {
+    if (IsIBrowserServicePatchEnabled()) {
       ProcessOptInUrls(web_browser2, url->bstrVal);
     }
   }
@@ -320,10 +319,10 @@
 
     ProtocolPatchMethod patch_method = GetPatchMethod();
     if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
-      ProtocolSinkWrap::PatchProtocolHandlers();
+      g_trans_hooks.InstallHooks();
       state_ = PATCH_PROTOCOL;
     } else if (patch_method == PATCH_METHOD_IBROWSER) {
-        state_ =  PATCH_IBROWSER;
+      state_ =  PATCH_IBROWSER;
     } else {
       DCHECK(patch_method == PATCH_METHOD_MONIKER);
       state_ = PATCH_MONIKER;
@@ -348,7 +347,7 @@
 
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
-    ProtocolSinkWrap::UnpatchProtocolHandlers();
+    g_trans_hooks.RevertHooks();
   } else if (state_ == PATCH_IBROWSER) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
     MonikerPatch::Uninitialize();