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

This is just some code cleanup and should have no behavior changes.


BUG=239073
For webui/chromeos, browser/geolocation:
TBR=nkostylev@chromium.org,joth@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14729017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202609 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index fcc60d8..fc083d3 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -377,8 +377,10 @@ void Network::SetValueProperty(const char* prop, const base::Value& value) {
     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) {
@@ -387,8 +389,10 @@ void Network::ClearProperty(const char* prop) {
     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(
@@ -456,8 +460,10 @@ void Network::AttemptConnection(const base::Closure& closure) {
 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) {