Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

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 55 matching lines @@
       enable_compression_(enable_compression),
       enable_ping_based_connection_checking_(
           enable_ping_based_connection_checking),
       default_protocol_(default_protocol),
       initial_recv_window_size_(initial_recv_window_size),
       initial_max_concurrent_streams_(initial_max_concurrent_streams),
       max_concurrent_streams_limit_(max_concurrent_streams_limit),
       time_func_(time_func),
       trusted_spdy_proxy_(
           HostPortPair::FromString(trusted_spdy_proxy)) {
-  NetworkChangeNotifier::AddIPAddressObserver(this);
+  NetworkChangeNotifier::AddNetworkChangeObserver(this);
   if (ssl_config_service_)
     ssl_config_service_->AddObserver(this);
   CertDatabase::GetInstance()->AddObserver(this);
 }
 
 SpdySessionPool::~SpdySessionPool() {
   CloseAllSessions();
 
   if (ssl_config_service_)
     ssl_config_service_->RemoveObserver(this);
-  NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   CertDatabase::GetInstance()->RemoveObserver(this);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::Get(
     const HostPortProxyPair& host_port_proxy_pair,
     const BoundNetLog& net_log) {
   return GetInternal(host_port_proxy_pair, net_log, false);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::GetIfExists(
@@ skipping 169 matching lines @@
       // host_port_proxy_pair (not an alias).
       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(ERR_NETWORK_CHANGED);
-  http_server_properties_->ClearSpdySettings();
+void SpdySessionPool::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type == net::NetworkChangeNotifier::CONNECTION_NONE) {
+    CloseCurrentSessions(ERR_NETWORK_CHANGED);
+    http_server_properties_->ClearSpdySettings();
+  }
 }
 
 void SpdySessionPool::OnSSLConfigChanged() {
   CloseCurrentSessions(ERR_NETWORK_CHANGED);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::GetExistingSession(
     SpdySessionList* list,
     const BoundNetLog& net_log) const {
   DCHECK(list);
@@ skipping 198 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