Not freeing the cached request data when we get OnHttpEquiv(done==TRUE) and the browser is tagged for CF navigation.

I found that if I load a CF page, then go to the address bar and press enter, we will actually get both OnHttpEquiv(done==false) and then followed by OnHttpEquiv(done==TRUE) even though we kicked off a new navigation in between.  When this happened we would clear the cache in OnHttpEquiv(done==true) and subsequently we'd have to go to the network to fetch the content once CF is instantiated.

TEST=See description.
BUG=none

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

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

1 files changed, 9 insertions, 4 deletions

diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 9700b91..f685166 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -252,10 +252,15 @@ HRESULT Bho::OnHttpEquiv(IBrowserService_OnHttpEquiv_Fn original_httpequiv,
       }
     }
   } else if (done) {
-    DLOG(INFO) << "Releasing cached data.";
-    NavigationManager* mgr = NavigationManager::GetThreadInstance();
-    if (mgr)
-      mgr->ReleaseRequestData();
+    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);