Introduce ERR_NETWORK_CHANGED and allow URLFetcher to automatically retry on that error.

net/spdy/spdy_session_pool.cc

 // Copyright (c) 2012 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 "net/spdy/spdy_session_pool.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
@@ skipping 257 matching lines @@
       const HostPortProxyPair& key = it->first;
       const HostPortProxyPair& pair = session->get()->host_port_proxy_pair();
       if (key.first.Equals(pair.first) && key.second == pair.second)
         list->Append(session->get()->GetInfoAsValue());
     }
   }
   return list;
 }
 
 void SpdySessionPool::OnIPAddressChanged() {
-  CloseCurrentSessions();
+  CloseCurrentSessions(ERR_NETWORK_CHANGED);
   http_server_properties_->ClearSpdySettings();
 }
 
 void SpdySessionPool::OnSSLConfigChanged() {
-  CloseCurrentSessions();
+  CloseCurrentSessions(ERR_ABORTED);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::GetExistingSession(
     SpdySessionList* list,
     const BoundNetLog& net_log) const {
   DCHECK(list);
   DCHECK_LT(0u, list->size());
   scoped_refptr<SpdySession> spdy_session = list->front();
   if (list->size() > 1) {
     list->pop_front();  // Rotate the list.
@@ skipping 46 matching lines @@
       continue;
     }
     if (record_histograms)
       UMA_HISTOGRAM_ENUMERATION("Net.SpdyIPPoolDomainMatch", 1, 2);
     return spdy_session;
   }
   return NULL;
 }
 
 void SpdySessionPool::OnCertAdded(const X509Certificate* cert) {
-  CloseCurrentSessions();
+  CloseCurrentSessions(ERR_ABORTED);
 }
 
 void SpdySessionPool::OnCertTrustChanged(const X509Certificate* cert) {
   // Per wtc, we actually only need to CloseCurrentSessions when trust is
   // reduced. CloseCurrentSessions now because OnCertTrustChanged does not
   // tell us this.
   // See comments in ClientSocketPoolManager::OnCertTrustChanged.
-  CloseCurrentSessions();
+  CloseCurrentSessions(ERR_ABORTED);
 }
 
 const HostPortProxyPair& SpdySessionPool::NormalizeListPair(
     const HostPortProxyPair& host_port_proxy_pair) const {
   if (!force_single_domain_)
     return host_port_proxy_pair;
 
   static HostPortProxyPair* single_domain_pair = NULL;
   if (!single_domain_pair) {
     HostPortPair single_domain = HostPortPair("singledomain.com", 80);
@@ skipping 71 matching lines @@
     CHECK(list);
     const scoped_refptr<SpdySession>& session = list->front();
     CHECK(session);
     // This call takes care of removing the session from the pool, as well as
     // removing the session list if the list is empty.
     session->CloseSessionOnError(
         net::ERR_ABORTED, true, "Closing all sessions.");
   }
 }
 
-void SpdySessionPool::CloseCurrentSessions() {
+void SpdySessionPool::CloseCurrentSessions(net::Error error) {
   SpdySessionsMap old_map;
   old_map.swap(sessions_);
   for (SpdySessionsMap::const_iterator it = old_map.begin();
        it != old_map.end(); ++it) {
     SpdySessionList* list = it->second;
     CHECK(list);
     const scoped_refptr<SpdySession>& session = list->front();
     CHECK(session);
     session->set_spdy_session_pool(NULL);
   }
 
   while (!old_map.empty()) {
     SpdySessionList* list = old_map.begin()->second;
     CHECK(list);
     const scoped_refptr<SpdySession>& session = list->front();
     CHECK(session);
-    session->CloseSessionOnError(
-        net::ERR_ABORTED, false, "Closing current sessions.");
+    session->CloseSessionOnError(error, false, "Closing current sessions.");
     list->pop_front();
     if (list->empty()) {
       delete list;
       RemoveAliases(old_map.begin()->first);
       old_map.erase(old_map.begin()->first);
     }
   }
   DCHECK(sessions_.empty());
   DCHECK(aliases_.empty());
 }
@@ skipping 10 matching lines @@
     const scoped_refptr<SpdySession>& session = *session_it;
     CHECK(session);
     if (!session->is_active()) {
       session->CloseSessionOnError(
           net::ERR_ABORTED, true, "Closing idle sessions.");
     }
   }
 }
 
 }  // namespace net