Use setProperties for IP Config.

chromeos/network/network_configuration_handler_unittest.cc

 // 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 <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 180 matching lines @@
 
     EXPECT_CALL(*mock_service_client_, GetProperties(_, _)).Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, GetProperties(_)).Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_))
         .Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_))
         .Times(AnyNumber());
 
     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();
   }
 
   virtual void TearDown() override {
     network_configuration_handler_.reset();
     network_state_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   // Handles responses for GetProperties method calls.
@@ skipping 137 matching lines @@
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, SetProperties(_, _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnSetProperties));
   network_configuration_handler_->SetProperties(
       service_path, value, NetworkConfigurationObserver::SOURCE_USER_ACTION,
       base::Bind(&base::DoNothing),
       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(_, _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnClearProperties));
   network_configuration_handler_->ClearProperties(
       service_path, values_to_clear, base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 }
@@ skipping 11 matching lines @@
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, SetProperties(_, _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnSetProperties));
   network_configuration_handler_->SetProperties(
       service_path, value, NetworkConfigurationObserver::SOURCE_USER_ACTION,
       base::Bind(&base::DoNothing),
       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(_, _, _, _))
       .WillOnce(Invoke(
           this, &NetworkConfigurationHandlerTest::OnClearPropertiesError));
   network_configuration_handler_->ClearProperties(
       service_path, values_to_clear, base::Bind(&base::DoNothing),
       base::Bind(&ErrorCallback, true, service_path));
   message_loop_.RunUntilIdle();
 }
@@ skipping 81 matching lines @@
   virtual ~NetworkConfigurationHandlerStubTest() {}
 
   virtual void SetUp() override {
     DBusThreadManager::Initialize();
 
     network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
     test_observer_.reset(new TestObserver());
     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();
   }
 
   virtual void TearDown() override {
     network_configuration_handler_.reset();
     network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE);
     network_state_handler_.reset();
     DBusThreadManager::Shutdown();
@@ skipping 227 matching lines @@
   EXPECT_FALSE(test_observer->HasConfiguration(service_path));
   EXPECT_FALSE(test_observer->HasConfigurationInProfile(
       service_path, NetworkProfileHandler::GetSharedProfilePath()));
   EXPECT_FALSE(
       test_observer->HasConfigurationInProfile(service_path, user_profile));
 
   network_configuration_handler_->RemoveObserver(test_observer.get());
 }
 
 }  // namespace chromeos