Add NetworkHandler to own network handlers in src/chromeos/network

chrome/browser/chromeos/net/network_portal_detector_impl.cc

Index: chrome/browser/chromeos/net/network_portal_detector_impl.cc
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
index 33634364885503ca3b79a3ba98f243bf232f2f0e..87bc8621fc7ed0d7c0aeb3a9e748d2ab4cb13f46 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
@@ -98,7 +98,7 @@ void NetworkPortalDetectorImpl::Init() {
   DCHECK(CalledOnValidThread());
 
   state_ = STATE_IDLE;
-  NetworkStateHandler::Get()->AddObserver(this);
+  NetworkHandler::Get()->network_state_handler()->AddObserver(this);
 }
 
 void NetworkPortalDetectorImpl::Shutdown() {
@@ -110,8 +110,8 @@ void NetworkPortalDetectorImpl::Shutdown() {
   captive_portal_detector_->Cancel();
   captive_portal_detector_.reset();
   observers_.Clear();
-  if (NetworkStateHandler::IsInitialized())
-    NetworkStateHandler::Get()->RemoveObserver(this);
+  if (NetworkHandler::IsInitialized())
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
 }
 
 void NetworkPortalDetectorImpl::AddObserver(Observer* observer) {
@@ -126,7 +126,8 @@ void NetworkPortalDetectorImpl::AddAndFireObserver(Observer* observer) {
   if (!observer)
     return;
   AddObserver(observer);
-  const NetworkState* network = NetworkStateHandler::Get()->DefaultNetwork();
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   observer->OnPortalDetectionCompleted(network, GetCaptivePortalState(network));
 }
 
@@ -153,7 +154,7 @@ void NetworkPortalDetectorImpl::Enable(bool start_detection) {
   state_ = STATE_IDLE;
   attempt_count_ = 0;
   const NetworkState* default_network =
-      NetworkStateHandler::Get()->DefaultNetwork();
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!default_network)
     return;
   portal_state_map_.erase(default_network->path());
@@ -196,7 +197,7 @@ void NetworkPortalDetectorImpl::DisableLazyDetection() {
 void NetworkPortalDetectorImpl::NetworkManagerChanged() {
   DCHECK(CalledOnValidThread());
   const NetworkState* default_network =
-      NetworkStateHandler::Get()->DefaultNetwork();
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!default_network) {
     default_network_id_.clear();
     return;
@@ -348,7 +349,7 @@ void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
   detection_timeout_.Cancel();
 
   const NetworkState* default_network =
-      NetworkStateHandler::Get()->DefaultNetwork();
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
 
   CaptivePortalState state;
   state.response_code = results.response_code;
@@ -467,7 +468,8 @@ bool NetworkPortalDetectorImpl::DetectionTimeoutIsCancelledForTesting() const {
 
 int NetworkPortalDetectorImpl::GetRequestTimeoutSec() const {
   DCHECK_LE(0, attempt_count_);
-  const NetworkState* network = NetworkStateHandler::Get()->DefaultNetwork();
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network)
     return kBaseRequestTimeoutSec;
   if (lazy_detection_enabled_)