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>

ipconfig.cc

diff --git a/ipconfig.cc b/ipconfig.cc
index 5eec6de..4ff708f 100644
--- a/ipconfig.cc
+++ b/ipconfig.cc
@@ -45,21 +45,16 @@
 }
 
 void IPConfig::Init() {
-  store_.RegisterConstString(flimflam::kAddressProperty,
-                             &properties_.address);
-  store_.RegisterConstString(flimflam::kBroadcastProperty,
+  store_.RegisterConstString(kAddressProperty, &properties_.address);
+  store_.RegisterConstString(kBroadcastProperty,
                              &properties_.broadcast_address);
-  store_.RegisterConstString(flimflam::kDomainNameProperty,
-                             &properties_.domain_name);
-  store_.RegisterConstString(flimflam::kGatewayProperty, &properties_.gateway);
-  store_.RegisterConstString(flimflam::kMethodProperty, &properties_.method);
-  store_.RegisterConstInt32(flimflam::kMtuProperty, &properties_.mtu);
-  store_.RegisterConstStrings(flimflam::kNameServersProperty,
-                              &properties_.dns_servers);
-  store_.RegisterConstString(flimflam::kPeerAddressProperty,
-                             &properties_.peer_address);
-  store_.RegisterConstInt32(flimflam::kPrefixlenProperty,
-                            &properties_.subnet_prefix);
+  store_.RegisterConstString(kDomainNameProperty, &properties_.domain_name);
+  store_.RegisterConstString(kGatewayProperty, &properties_.gateway);
+  store_.RegisterConstString(kMethodProperty, &properties_.method);
+  store_.RegisterConstInt32(kMtuProperty, &properties_.mtu);
+  store_.RegisterConstStrings(kNameServersProperty, &properties_.dns_servers);
+  store_.RegisterConstString(kPeerAddressProperty, &properties_.peer_address);
+  store_.RegisterConstInt32(kPrefixlenProperty, &properties_.subnet_prefix);
   store_.RegisterConstStrings(kSearchDomainsProperty,
                               &properties_.domain_search);
   store_.RegisterConstString(kWebProxyAutoDiscoveryUrlProperty,
@@ -142,10 +137,8 @@
 }
 
 void IPConfig::EmitChanges() {
-  adaptor_->EmitStringChanged(flimflam::kAddressProperty,
-                              properties_.address);
-  adaptor_->EmitStringsChanged(flimflam::kNameServersProperty,
-                               properties_.dns_servers);
+  adaptor_->EmitStringChanged(kAddressProperty, properties_.address);
+  adaptor_->EmitStringsChanged(kNameServersProperty, properties_.dns_servers);
 }
 
 }  // namespace shill