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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 1607 matching lines @@
     }
 
     // Close blocked popups.
     if (blocked_popups_) {
       AutoReset<bool> auto_reset(&dont_notify_render_view_, true);
       blocked_popups_->Destroy();
       blocked_popups_ = NULL;
     }
 
     // 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
     // displayed insecure content.
     displayed_insecure_content_ = false;
   }
 
   // Close constrained windows if necessary.
   if (!net::RegistryControlledDomainService::SameDomainOrHost(
       details.previous_url, details.entry->url()))
@@ skipping 419 matching lines @@
     RenderViewHost* render_view_host,
     bool is_main_frame,
     const GURL& url) {
   ProvisionalLoadDetails details(is_main_frame,
                                  controller_.IsURLInPageNavigation(url),
                                  url, std::string(), false);
   NotificationService::current()->Notify(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
+  if (is_main_frame)
+    content_settings_delegate_->ClearCookieSpecificContentSettings();
 }
 
 void TabContents::DidStartReceivingResourceResponse(
     const ResourceRequestDetails& details) {
   NotificationService::current()->Notify(
       NotificationType::RESOURCE_RESPONSE_STARTED,
       Source<NavigationController>(&controller()),
       Details<const ResourceRequestDetails>(&details));
 }
 
@@ skipping 1222 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }