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

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"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 2119 matching lines @@
     bool is_main_frame,
     const GURL& url) {
   ProvisionalLoadDetails details(is_main_frame,
                                  controller_.IsURLInPageNavigation(url),
                                  url, std::string(), false, frame_id);
   NotificationService::current()->Notify(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       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();
   }
 }
 
 void TabContents::DidStartReceivingResourceResponse(
     const ResourceRequestDetails& details) {
   NotificationService::current()->Notify(
       NotificationType::RESOURCE_RESPONSE_STARTED,
       Source<NavigationController>(&controller()),
       Details<const ResourceRequestDetails>(&details));
@@ skipping 1066 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }