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

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 816a71f5949ece6dc1ee3f57f1610fbfcde1b14a..0f2d1fa563ac6a140f3c47e47e29666b4b150265 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -106,16 +106,9 @@
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "chromeos/login/login_state.h"
-#include "chromeos/network/cert_loader.h"
-#include "chromeos/network/geolocation_handler.h"
-#include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
-#include "chromeos/network/network_configuration_handler.h"
-#include "chromeos/network/network_connection_handler.h"
-#include "chromeos/network/network_event_log.h"
-#include "chromeos/network/network_profile_handler.h"
-#include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/power/power_manager_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -314,8 +307,6 @@ class DBusServices {
     CrosDBusService::Initialize();
 
     LoginState::Initialize();
-    CertLoader::Initialize();
-    CertLibrary::Initialize();
     CryptohomeLibrary::Initialize();
 
     // This function and SystemKeyEventListener use InputMethodManager.
@@ -329,15 +320,8 @@ class DBusServices {
 
     // Always initialize these handlers which should not conflict with
     // NetworkLibrary.
-    network_event_log::Initialize();
-    GeolocationHandler::Initialize();
-    NetworkStateHandler::Initialize();
-
-    NetworkProfileHandler* profile_handler =
-        NetworkProfileHandler::Initialize();
-    NetworkConfigurationHandler::Initialize();
-    ManagedNetworkConfigurationHandler::Initialize(profile_handler);
-    NetworkConnectionHandler::Initialize();
+    NetworkHandler::Initialize();
+    CertLibrary::Initialize();
 
     // Initialize the network change notifier for Chrome OS. The network
     // change notifier starts to monitor changes from the power manager and
@@ -379,21 +363,14 @@ class DBusServices {
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
-    NetworkConnectionHandler::Shutdown();
-    ManagedNetworkConfigurationHandler::Shutdown();
-    NetworkConfigurationHandler::Shutdown();
-    NetworkProfileHandler::Shutdown();
-
-    NetworkStateHandler::Shutdown();
-    GeolocationHandler::Shutdown();
-    network_event_log::Shutdown();
+    CertLibrary::Shutdown();
+    NetworkHandler::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
     input_method::Shutdown();
+
     CryptohomeLibrary::Shutdown();
-    CertLibrary::Shutdown();
-    CertLoader::Shutdown();
     LoginState::Shutdown();
 
     CrosDBusService::Shutdown();