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 2111 matching lines @@
 
 void TabContents::OnInstantSupportDetermined(int32 page_id, bool result) {
   if (delegate())
     delegate()->OnInstantSupportDetermined(page_id, result);
 }
 
 void TabContents::DidStartProvisionalLoadForFrame(
     RenderViewHost* render_view_host,
     long long frame_id,
     bool is_main_frame,
+    bool is_unreachable_web_data,

[darin (slow to review), 2010/11/30 18:28:57]

nit: "is_error_page" seems like a better choice for this parameter name.  it
better matches what you wrote in the comment below.

     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 we're displaying a network error page do not reset the content
+    // settings delegate's cookies so the user has a chance to modify cookie
+    // settings.
+    if (!is_unreachable_web_data)
+      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 1078 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);
 }