Do not reset the content settings delegate's cookies when a network error occurred.

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 cfa1ac00be62906643a4ec12b6b00af5364441f2..93ac0df5e12ad2a55bb6006940d0891709e96e31 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -2137,7 +2137,11 @@ void TabContents::DidStartProvisionalLoadForFrame(
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
   if (is_main_frame) {
-    content_settings_delegate_->ClearCookieSpecificContentSettings();
+    // If the URL is invalid, we're displaying a network error page. Not
+    // resetting the content settings delegate's cookies in that case so the
+    // user has a chance to modify cookie settings.
+    if (url.is_valid())

[darin (slow to review), 2010/11/24 17:14:07]

it seems like we should have a more direct signal that we're loading an error
page.  i think it could also be reasonable for the url parameter to contain a
valid URL in the case that we are loading an error page, so it seems fairly
fragile to rely on this signal here.  also, can you add a regression test?

+      content_settings_delegate_->ClearCookieSpecificContentSettings();
     content_settings_delegate_->ClearGeolocationContentSettings();
   }
 }