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

chromeos/network/network_configuration_handler_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+  // 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 "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
@@ skipping 69 matching lines @@
   virtual void SetUp() OVERRIDE {
     MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager;
     EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())
     .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
     mock_manager_client_ =
         mock_dbus_thread_manager->mock_shill_manager_client();
     mock_service_client_ =
         mock_dbus_thread_manager->mock_shill_service_client();
 
-    NetworkStateHandler::Initialize();
-    NetworkConfigurationHandler::Initialize();
+    network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
+    network_configuration_handler_.reset(new NetworkConfigurationHandler());
+    network_configuration_handler_->Init(network_state_handler_.get());
     message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
-    NetworkConfigurationHandler::Shutdown();
-    NetworkStateHandler::Shutdown();
+    network_configuration_handler_.reset();
+    network_state_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   // Handles responses for GetProperties method calls.
   void OnGetProperties(
       const dbus::ObjectPath& path,
       const ShillClientHelper::DictionaryValueCallback& callback) {
     callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_);
   }
 
@@ skipping 35 matching lines @@
 
   void OnRemove(const dbus::ObjectPath& service_path,
                     const base::Closure& callback,
                     const ShillClientHelper::ErrorCallback& error_callback) {
     callback.Run();
   }
 
  protected:
   MockShillManagerClient* mock_manager_client_;
   MockShillServiceClient* mock_service_client_;
+  scoped_ptr<NetworkStateHandler> network_state_handler_;
+  scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
   MessageLoop message_loop_;
   base::DictionaryValue* dictionary_value_result_;
 };
 
 TEST_F(NetworkConfigurationHandlerTest, GetProperties) {
   std::string service_path = "/service/1";
   std::string expected_json = "{\n   \"SSID\": \"MyNetwork\"\n}\n";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   scoped_ptr<base::StringValue> networkNameValue(
       base::Value::CreateStringValue(networkName));
 
   base::DictionaryValue value;
   value.Set(key, base::Value::CreateStringValue(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_,
               SetProperty(dbus::ObjectPath(service_path), key,
                           IsEqualTo(networkNameValue.get()), _, _)).Times(1);
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(service_path), key, *networkNameValue,
       base::Bind(&base::DoNothing),
       base::Bind(&DBusErrorCallback));
   message_loop_.RunUntilIdle();
 
   ShillServiceClient::DictionaryValueCallback get_properties_callback;
   EXPECT_CALL(*mock_service_client_,
               GetProperties(_, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnGetProperties));
-  NetworkConfigurationHandler::Get()->GetProperties(
+  network_configuration_handler_->GetProperties(
       service_path,
       base::Bind(&DictionaryValueCallback,
                  service_path,
                  expected_json),
                  base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, SetProperties) {
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   scoped_ptr<base::StringValue> networkNameValue(
       base::Value::CreateStringValue(networkName));
 
   base::DictionaryValue value;
   value.Set(key, base::Value::CreateStringValue(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_manager_client_,
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  network_configuration_handler_->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, ClearProperties) {
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   scoped_ptr<base::StringValue> networkNameValue(
       base::Value::CreateStringValue(networkName));
 
   // First set up a value to clear.
   base::DictionaryValue value;
   value.Set(key, base::Value::CreateStringValue(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_manager_client_,
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  network_configuration_handler_->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 
   // Now clear it.
   std::vector<std::string> values_to_clear;
   values_to_clear.push_back(key);
   EXPECT_CALL(*mock_service_client_,
               ClearProperties(_, _, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnClearProperties));
-  NetworkConfigurationHandler::Get()->ClearProperties(
+  network_configuration_handler_->ClearProperties(
       service_path,
       values_to_clear,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, ClearPropertiesError) {
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   scoped_ptr<base::StringValue> networkNameValue(
       base::Value::CreateStringValue(networkName));
 
   // First set up a value to clear.
   base::DictionaryValue value;
   value.Set(key, base::Value::CreateStringValue(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_manager_client_,
               ConfigureService(_, _, _)).WillOnce(
                   Invoke(this,
                          &NetworkConfigurationHandlerTest::OnSetProperties));
-  NetworkConfigurationHandler::Get()->SetProperties(
+  network_configuration_handler_->SetProperties(
       service_path,
       value,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 
   // Now clear it.
   std::vector<std::string> values_to_clear;
   values_to_clear.push_back(key);
   EXPECT_CALL(
       *mock_service_client_,
       ClearProperties(_, _, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnClearPropertiesError));
-  NetworkConfigurationHandler::Get()->ClearProperties(
+  network_configuration_handler_->ClearProperties(
       service_path,
       values_to_clear,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, true, service_path));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, CreateConfiguration) {
   std::string expected_json = "{\n   \"SSID\": \"MyNetwork\"\n}\n";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   scoped_ptr<base::StringValue> networkNameValue(
       base::Value::CreateStringValue(networkName));
   base::DictionaryValue value;
   value.Set(key, base::Value::CreateStringValue(networkName));
 
   EXPECT_CALL(
       *mock_manager_client_,
       GetService(_, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnGetService));
-  NetworkConfigurationHandler::Get()->CreateConfiguration(
+  network_configuration_handler_->CreateConfiguration(
       value,
       base::Bind(&StringResultCallback, std::string("/service/2")),
       base::Bind(&ErrorCallback, false, std::string("")));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, RemoveConfiguration) {
   std::string service_path = "/service/1";
 
   EXPECT_CALL(
       *mock_service_client_,
       Remove(_, _, _)).WillOnce(
           Invoke(this,
                  &NetworkConfigurationHandlerTest::OnRemove));
-  NetworkConfigurationHandler::Get()->RemoveConfiguration(
+  network_configuration_handler_->RemoveConfiguration(
       service_path,
       base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos