Use setProperties for IP Config.

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 f92e85a7f842316e5c96cd5ebe6497a8c8727443..b0f42b62eb9e66bf048b1569ebaef4b157d3eedd 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -198,7 +198,8 @@ class NetworkConfigurationHandlerTest : public testing::Test {
 
     network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
     network_configuration_handler_.reset(new NetworkConfigurationHandler());
-    network_configuration_handler_->Init(network_state_handler_.get());
+    network_configuration_handler_->Init(network_state_handler_.get(),
+                                         NULL /* network_device_handler */);
     message_loop_.RunUntilIdle();
   }
 
@@ -356,7 +357,11 @@ TEST_F(NetworkConfigurationHandlerTest, ClearProperties) {
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 
-  // Now clear it.
+  // Now clear it. This will first perform a GetProperties call so that only
+  // existing properties are cleared.
+  EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
+      .WillRepeatedly(
+          Invoke(this, &NetworkConfigurationHandlerTest::OnGetProperties));
   std::vector<std::string> values_to_clear;
   values_to_clear.push_back(key);
   EXPECT_CALL(*mock_service_client_, ClearProperties(_, _, _, _))
@@ -388,7 +393,11 @@ TEST_F(NetworkConfigurationHandlerTest, ClearPropertiesError) {
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 
-  // Now clear it.
+  // Now clear it. This will first perform a GetProperties call so that only
+  // existing properties are cleared.
+  EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
+      .WillRepeatedly(
+          Invoke(this, &NetworkConfigurationHandlerTest::OnGetProperties));
   std::vector<std::string> values_to_clear;
   values_to_clear.push_back(key);
   EXPECT_CALL(*mock_service_client_, ClearProperties(_, _, _, _))
@@ -490,7 +499,8 @@ class NetworkConfigurationHandlerStubTest : public testing::Test {
     network_state_handler_->AddObserver(test_observer_.get(), FROM_HERE);
 
     network_configuration_handler_.reset(new NetworkConfigurationHandler());
-    network_configuration_handler_->Init(network_state_handler_.get());
+    network_configuration_handler_->Init(network_state_handler_.get(),
+                                         NULL /* network_device_handler */);
 
     message_loop_.RunUntilIdle();
     test_observer_->ClearPropertyUpdates();