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

chrome/browser/chromeos/chrome_browser_main_chromeos.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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 88 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #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 "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace chromeos {
@@ skipping 177 matching lines @@
                               user_data_dir.AppendASCII("stub_user_policy"));
       }
     }
 
     // Initialize DBusThreadManager for the browser. This must be done after
     // the main message loop is started, as it uses the message loop.
     DBusThreadManager::Initialize();
     CrosDBusService::Initialize();
 
     LoginState::Initialize();
-    CertLoader::Initialize();
-    CertLibrary::Initialize();
     CryptohomeLibrary::Initialize();
 
     // This function and SystemKeyEventListener use InputMethodManager.
     chromeos::input_method::Initialize(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::UI),
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::FILE));
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
 
     // 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
     // the network manager.
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kDisableNewNetworkChangeNotifier)) {
       NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
     } else {
       CrosNetworkChangeNotifierFactory::GetInstance()->Init();
     }
@@ skipping 21 matching lines @@
   ~DBusServices() {
     ConnectivityStateHelper::Shutdown();
     // CrosLibrary is shut down before DBusThreadManager even though it
     // is initialized first becuase some of its libraries depend on DBus
     // clients.
     // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
     // (crosbug.com/26160)
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
-    ManagedNetworkConfigurationHandler::Shutdown();
-    NetworkConfigurationHandler::Shutdown();
-    NetworkConnectionHandler::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();
 
     // NOTE: This must only be called if Initialize() was called.
     DBusThreadManager::Shutdown();
   }
 
  private:
   bool cros_initialized_;
@@ skipping 498 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos