Eliminate NetworkManagerChanged

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 2013 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/chromeos/net/network_portal_detector_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 188 matching lines @@
 
 void NetworkPortalDetectorImpl::DisableLazyDetection() {
   if (!lazy_detection_enabled())
     return;
   lazy_detection_enabled_ = false;
   if (attempt_count_ == kMaxRequestAttempts && IsPortalCheckPending())
     CancelPortalDetection();
   VLOG(1) << "Lazy detection mode disabled.";
 }
 
-void NetworkPortalDetectorImpl::NetworkManagerChanged() {
+void NetworkPortalDetectorImpl::DefaultNetworkChanged(
+    const NetworkState* default_network) {
   DCHECK(CalledOnValidThread());
-  const NetworkState* default_network =
-      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!default_network) {
     default_network_id_.clear();
     return;
   }
 
   default_network_id_ = default_network->guid();
 
   bool network_changed = (default_service_path_ != default_network->path());
   default_service_path_ = default_network->path();
 
@@ skipping 13 matching lines @@
     // offline or if network connection state was changed.
     CaptivePortalState state = GetCaptivePortalState(default_network);
     if (state.status == CAPTIVE_PORTAL_STATUS_UNKNOWN ||
         state.status == CAPTIVE_PORTAL_STATUS_OFFLINE ||
         (!network_changed && connection_state_changed)) {
       DetectCaptivePortal(base::TimeDelta());
     }
   }
 }
 
-void NetworkPortalDetectorImpl::DefaultNetworkChanged(
-    const NetworkState* network) {
-  NetworkManagerChanged();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkPortalDetectorImpl, private:
 
 bool NetworkPortalDetectorImpl::CanPerformDetection() const {
   if (IsPortalCheckPending() || IsCheckingForPortal())
     return false;
   return attempt_count_ < kMaxRequestAttempts || lazy_detection_enabled();
 }
 
 void NetworkPortalDetectorImpl::DetectCaptivePortal(
@@ skipping 234 matching lines @@
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network)
     return kBaseRequestTimeoutSec;
   if (lazy_detection_enabled_)
     return kLazyRequestTimeoutSec;
   return attempt_count_ * kBaseRequestTimeoutSec;
 }
 
 }  // namespace chromeos