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

chromeos/network/network_configuration_handler_unittest.cc

Index: chromeos/network/network_configuration_handler_unittest.cc
diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc
index e33f64aedb96e9ed13493f249173c467f55e2b75..3c6750ee4900468e06dff274dd3234e80ef915fb 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -87,13 +87,12 @@ class NetworkConfigurationHandlerTest : public testing::Test {
     mock_service_client_ =
         mock_dbus_thread_manager->mock_shill_service_client();
 
-    // Initialize DBusThreadManager with a stub implementation.
-    NetworkConfigurationHandler::Initialize();
+    NetworkHandler::Initialize();
     message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
-    NetworkConfigurationHandler::Shutdown();
+    NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
   }
 
@@ -190,7 +189,7 @@ TEST_F(NetworkConfigurationHandlerTest, GetProperties) {
               GetProperties(_, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnGetProperties));
-  NetworkConfigurationHandler::Get()->GetProperties(
+  NetworkHandler::Get()->network_configuration_handler()->GetProperties(
       service_path,
       base::Bind(&DictionaryValueCallback,
                  service_path,
@@ -213,7 +212,7 @@ TEST_F(NetworkConfigurationHandlerTest, SetProperties) {
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  NetworkHandler::Get()->network_configuration_handler()->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
@@ -236,7 +235,7 @@ TEST_F(NetworkConfigurationHandlerTest, ClearProperties) {
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  NetworkHandler::Get()->network_configuration_handler()->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
@@ -250,7 +249,7 @@ TEST_F(NetworkConfigurationHandlerTest, ClearProperties) {
               ClearProperties(_, _, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnClearProperties));
-  NetworkConfigurationHandler::Get()->ClearProperties(
+  NetworkHandler::Get()->network_configuration_handler()->ClearProperties(
       service_path,
       values_to_clear,
       base::Bind(&base::DoNothing),
@@ -273,7 +272,7 @@ TEST_F(NetworkConfigurationHandlerTest, ClearPropertiesError) {
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  NetworkHandler::Get()->network_configuration_handler()->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
@@ -288,7 +287,7 @@ TEST_F(NetworkConfigurationHandlerTest, ClearPropertiesError) {
       ClearProperties(_, _, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnClearPropertiesError));
-  NetworkConfigurationHandler::Get()->ClearProperties(
+  NetworkHandler::Get()->network_configuration_handler()->ClearProperties(
       service_path,
       values_to_clear,
       base::Bind(&base::DoNothing),
@@ -303,7 +302,7 @@ TEST_F(NetworkConfigurationHandlerTest, Connect) {
               Connect(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnConnect));
-  NetworkConfigurationHandler::Get()->Connect(
+  NetworkHandler::Get()->network_configuration_handler()->Connect(
       service_path,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
@@ -317,7 +316,7 @@ TEST_F(NetworkConfigurationHandlerTest, Disconnect) {
               Disconnect(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnDisconnect));
-  NetworkConfigurationHandler::Get()->Disconnect(
+  NetworkHandler::Get()->network_configuration_handler()->Disconnect(
       service_path,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
@@ -338,7 +337,7 @@ TEST_F(NetworkConfigurationHandlerTest, CreateConfiguration) {
       GetService(_, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnGetService));
-  NetworkConfigurationHandler::Get()->CreateConfiguration(
+  NetworkHandler::Get()->network_configuration_handler()->CreateConfiguration(
       value,
       base::Bind(&StringResultCallback, std::string("/service/2")),
       base::Bind(&ErrorCallback, false, std::string("")));
@@ -353,7 +352,7 @@ TEST_F(NetworkConfigurationHandlerTest, RemoveConfiguration) {
       Remove(_, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnRemove));
-  NetworkConfigurationHandler::Get()->RemoveConfiguration(
+  NetworkHandler::Get()->network_configuration_handler()->RemoveConfiguration(
       service_path,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));