Clear cookie related settings at the beginning of a navigation instead of at the end.

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index dbcf1dded11747686c4c68afc2a38acb7bfeb40a..838bab7f49eced06ea804771658cfb913705a769 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1625,7 +1625,7 @@ void TabContents::DidNavigateMainFramePostCommit(
     }
 
     // Clear "blocked" flags.
-    content_settings_delegate_->ClearBlockedContentSettings();
+    content_settings_delegate_->ClearBlockedContentSettingsExceptForCookies();
     content_settings_delegate_->GeolocationDidNavigate(details);
 
     // Once the main frame is navigated, we're no longer considered to have
@@ -2065,6 +2065,8 @@ void TabContents::DidStartProvisionalLoadForFrame(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
+  if (is_main_frame)
+    content_settings_delegate_->ClearCookieSpecificContentSettings();
 }
 
 void TabContents::DidStartReceivingResourceResponse(