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

chrome/browser/tab_contents/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
@@ skipping 24 matching lines @@
     // unit tests only.
     virtual void OnContentSettingsAccessed(bool content_was_blocked) = 0;
 
     virtual ~Delegate() {}
   };
 
   TabSpecificContentSettings(Delegate* delegate, Profile* profile);
 
   virtual ~TabSpecificContentSettings() {}
 
-  // Resets the |content_blocked_| array and stored cookies.
-  void ClearBlockedContentSettings();
+  // Resets the |content_blocked_| and |content_accessed_| arrays, except for
+  // CONTENT_SETTINGS_TYPE_COOKIES related information.
+  void ClearBlockedContentSettingsExceptForCookies();
+
+  // Resets all cookies related information.
+  void ClearCookieSpecificContentSettings();
 
   // Changes the |content_blocked_| entry for popups.
   void SetPopupsBlocked(bool blocked);
 
   // Updates Geolocation settings on navigation.
   void GeolocationDidNavigate(
       const NavigationController::LoadCommittedDetails& details);
 
   // Returns whether a particular kind of content has been blocked for this
   // page.
@@ skipping 92 matching lines @@
 
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_SPECIFIC_CONTENT_SETTINGS_H_