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

chrome/browser/chromeos/cros/network_library.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 "chrome/browser/chromeos/cros/network_library.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"  // for debug output only.
@@ skipping 359 matching lines @@
 
 void Network::CopyCredentialsFromRemembered(Network* remembered) {
 }
 
 void Network::SetValueProperty(const char* prop, const base::Value& value) {
   DCHECK(prop);
   if (!EnsureCrosLoaded())
     return;
   CrosSetNetworkServiceProperty(service_path_, prop, value);
   // Ensure NetworkStateHandler properties are up-to-date.
-  if (NetworkStateHandler::IsInitialized())
-    NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path());
+  if (NetworkHandler::IsInitialized()) {
+    NetworkHandler::Get()->network_state_handler()->RequestUpdateForNetwork(
+        service_path());
+  }
 }
 
 void Network::ClearProperty(const char* prop) {
   DCHECK(prop);
   if (!EnsureCrosLoaded())
     return;
   CrosClearNetworkServiceProperty(service_path_, prop);
   // Ensure NetworkStateHandler properties are up-to-date.
-  if (NetworkStateHandler::IsInitialized())
-    NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path());
+  if (NetworkHandler::IsInitialized()) {
+    NetworkHandler::Get()->network_state_handler()->RequestUpdateForNetwork(
+        service_path());
+  }
 }
 
 void Network::SetStringProperty(
     const char* prop, const std::string& str, std::string* dest) {
   if (dest)
     *dest = str;
   SetValueProperty(prop, base::StringValue(str));
 }
 
 void Network::SetOrClearStringProperty(const char* prop,
@@ skipping 47 matching lines @@
 
 void Network::AttemptConnection(const base::Closure& closure) {
   // By default, just invoke the closure right away.  Some subclasses
   // (Wifi, VPN, etc.) override to do more work.
   closure.Run();
 }
 
 void Network::set_connecting() {
   state_ = STATE_CONNECT_REQUESTED;
   // Set the connecting network in NetworkStateHandler for the status area UI.
-  if (NetworkStateHandler::IsInitialized())
-    NetworkStateHandler::Get()->SetConnectingNetwork(service_path());
+  if (NetworkHandler::IsInitialized()) {
+    NetworkHandler::Get()->network_state_handler()->
+        SetConnectingNetwork(service_path());
+  }
 }
 
 void Network::SetProfilePath(const std::string& profile_path) {
   VLOG(1) << "Setting profile for: " << name_ << " to: " << profile_path;
   SetOrClearStringProperty(
       flimflam::kProfileProperty, profile_path, &profile_path_);
 }
 
 std::string Network::GetStateString() const {
   return ConnectionStateString(state_);
@@ skipping 909 matching lines @@
   NetworkLibrary* impl;
   if (stub)
     impl = new NetworkLibraryImplStub();
   else
     impl = new NetworkLibraryImplCros();
   impl->Init();
   return impl;
 }
 
 }  // namespace chromeos