Switch renderer in Moniker patch

Step one of the changes. Inspect data and cause a switch
in the moniker patch. 


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

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

1 files changed, 6 insertions, 17 deletions

diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 4432c9f..3a731bc 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -251,16 +251,6 @@ HRESULT Bho::OnHttpEquiv(IBrowserService_OnHttpEquiv_Fn original_httpequiv,
         }
       }
     }
-  } else if (done) {
-    if (!CheckForCFNavigation(browser, false)) {
-      DLOG(INFO) << "Releasing cached data.";
-      NavigationManager* mgr = NavigationManager::GetThreadInstance();
-      if (mgr)
-        mgr->ReleaseRequestData();
-    } else {
-      DLOG(INFO) << __FUNCTION__
-          << " not freeing request data - browser tagged";
-    }
   }
 
   return original_httpequiv(browser, shell_view, done, in_arg, out_arg);
@@ -326,18 +316,17 @@ bool PatchHelper::InitializeAndPatchProtocolsIfNeeded() {
     ProtocolPatchMethod patch_method =
         static_cast<ProtocolPatchMethod>(
             GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
-
     if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
       ProtocolSinkWrap::PatchProtocolHandlers();
       state_ = PATCH_PROTOCOL;
+    } else if (patch_method == PATCH_METHOD_IBROWSER) {
+        state_ =  PATCH_IBROWSER;
     } else {
-      DCHECK(patch_method == PATCH_METHOD_IBROWSER ||
-             patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER);
-      state_ = PATCH_IBROWSER;
-      if (patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER) {
-        MonikerPatch::Initialize();
-      }
+      DCHECK(patch_method == PATCH_METHOD_MONIKER);
+      state_ = PATCH_MONIKER;
+      MonikerPatch::Initialize();
     }
+
     ret = true;
   }