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

chrome/browser/tab_contents/tab_specific_content_settings.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_specific_content_settings.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
@@ skipping 126 matching lines @@
     delegate_->OnContentSettingsAccessed(!allowed);
 }
 
 TabSpecificContentSettings::TabSpecificContentSettings(
     Delegate* delegate, Profile* profile)
     : allowed_local_shared_objects_(profile),
       blocked_local_shared_objects_(profile),
       geolocation_settings_state_(profile),
       load_plugins_link_enabled_(true),
       delegate_(NULL) {
-  ClearBlockedContentSettings();
+  ClearBlockedContentSettingsExceptForCookies();
+  ClearCookieSpecificContentSettings();
   delegate_ = delegate;
 }
 
-void TabSpecificContentSettings::ClearBlockedContentSettings() {
+void TabSpecificContentSettings::ClearBlockedContentSettingsExceptForCookies() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i) {
+    if (i == CONTENT_SETTINGS_TYPE_COOKIES)
+      continue;
     content_blocked_[i] = false;
     content_accessed_[i] = false;
   }
   load_plugins_link_enabled_ = true;
-  blocked_local_shared_objects_.Reset();
-  allowed_local_shared_objects_.Reset();
   if (delegate_)
     delegate_->OnContentSettingsAccessed(false);
 }
+
+void TabSpecificContentSettings::ClearCookieSpecificContentSettings() {
+  blocked_local_shared_objects_.Reset();
+  allowed_local_shared_objects_.Reset();
+  content_blocked_[CONTENT_SETTINGS_TYPE_COOKIES] = false;
+  content_accessed_[CONTENT_SETTINGS_TYPE_COOKIES] = false;
+  if (delegate_)
+    delegate_->OnContentSettingsAccessed(false);
+}
 
 void TabSpecificContentSettings::SetPopupsBlocked(bool blocked) {
   content_blocked_[CONTENT_SETTINGS_TYPE_POPUPS] = blocked;
   if (delegate_)
     delegate_->OnContentSettingsAccessed(blocked);
 }
 
 void TabSpecificContentSettings::GeolocationDidNavigate(
       const NavigationController::LoadCommittedDetails& details) {
   geolocation_settings_state_.DidNavigate(details);
@@ skipping 26 matching lines @@
   databases_->Reset();
   local_storages_->Reset();
   session_storages_->Reset();
 }
 
 CookiesTreeModel*
 TabSpecificContentSettings::LocalSharedObjectsContainer::GetCookiesTreeModel() {
   return new CookiesTreeModel(
       cookies_, databases_, local_storages_, session_storages_, appcaches_);
 }