commit 0295e0f1437aa1f1488f4ae6d0f2fdde1f315397
author Ben Chan <benchan@chromium.org> Fri Sep 20 13:47:29 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Sep 21 17:28:51 2013 +0000
tree 37d91a71fbadf443e5a7cc940bb1c92c90dcf712
parent 7372878af066cc079ad88a7b004ca3f769952de2

shill: ipconfig: Deprecate flimflam namespace.

CL:170123 moves all DBus service constants from the flimflam namespace
to the shill namespace. This CL removes the use of the flimflam
namespace in IP configuration code.

BUG=chromium:295425
CQ-DEPEND=CL:170123
TEST=Unit tests and trybot runs on release builders.

Change-Id: I557f9d16afe5cf711c1c5db31897db483d00f719
Reviewed-on: https://chromium-review.googlesource.com/170208
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 8116a65..0b2272d 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -671,7 +671,7 @@
   ::DBus::Error error;
   // Ensure that an attempt to write a R/O property returns InvalidArgs error.
   EXPECT_FALSE(DBusAdaptor::SetProperty(config_->mutable_store(),
-                                        flimflam::kAddressProperty,
+                                        kAddressProperty,
                                         PropertyStoreTest::kStringV,
                                         &error));
   ASSERT_TRUE(error.is_set());  // name() may be invalid otherwise