Massively simplify the NetworkChangeNotifier infrastructure:...

net/spdy/spdy_session_pool.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "net/spdy/spdy_session_pool.h"
 
 #include "base/logging.h"
 #include "net/spdy/spdy_session.h"
 
 namespace net {
 
 // The maximum number of sessions to open to a single domain.
 static const size_t kMaxSessionsPerDomain = 1;
 
 int SpdySessionPool::g_max_sessions_per_domain = kMaxSessionsPerDomain;
 
-SpdySessionPool::SpdySessionPool(NetworkChangeNotifier* notifier)
-    : network_change_notifier_(notifier) {
-  if (network_change_notifier_)
-    network_change_notifier_->AddObserver(this);
+SpdySessionPool::SpdySessionPool() {
+  NetworkChangeNotifier::AddObserver(this);
 }
 
 SpdySessionPool::~SpdySessionPool() {
   CloseAllSessions();
 
-  if (network_change_notifier_)
-    network_change_notifier_->RemoveObserver(this);
+  NetworkChangeNotifier::RemoveObserver(this);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::Get(
     const HostPortPair& host_port_pair, HttpNetworkSession* session,
     const BoundNetLog& net_log) {
   scoped_refptr<SpdySession> spdy_session;
   SpdySessionList* list = GetSessionList(host_port_pair);
   if (list) {
     if (list->size() >= static_cast<unsigned int>(g_max_sessions_per_domain)) {
       spdy_session = list->front();
@@ skipping 40 matching lines @@
 void SpdySessionPool::Remove(const scoped_refptr<SpdySession>& session) {
   SpdySessionList* list = GetSessionList(session->host_port_pair());
   DCHECK(list);  // We really shouldn't remove if we've already been removed.
   if (!list)
     return;
   list->remove(session);
   if (list->empty())
     RemoveSessionList(session->host_port_pair());
 }
 
+void SpdySessionPool::OnIPAddressChanged() {
+  ClearSessions();
+}
+
 SpdySessionPool::SpdySessionList*
     SpdySessionPool::AddSessionList(const HostPortPair& host_port_pair) {
   DCHECK(sessions_.find(host_port_pair) == sessions_.end());
   SpdySessionPool::SpdySessionList* list = new SpdySessionList();
   sessions_[host_port_pair] = list;
   return list;
 }
 
 SpdySessionPool::SpdySessionList*
     SpdySessionPool::GetSessionList(const HostPortPair& host_port_pair) {
@@ skipping 30 matching lines @@
       scoped_refptr<SpdySession> session = list->front();
       list->pop_front();
       if (close)
         session->CloseAllStreams(net::ERR_ABORTED);
     }
     delete list;
   }
 }
 
 }  // namespace net