Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/managed_network_configuration_handler_unittest.cc

Index: chromeos/network/managed_network_configuration_handler_unittest.cc
diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc
index dfeaebc0a13c6657d644a3f8deb0d1e70411b097..c2eca5e6710ada03ad5402875dfbce086c5b4546 100644
--- a/chromeos/network/managed_network_configuration_handler_unittest.cc
+++ b/chromeos/network/managed_network_configuration_handler_unittest.cc
@@ -79,7 +79,7 @@ class ShillProfileTestClient {
     ASSERT_TRUE(entries);
 
     base::DictionaryValue* new_entry = entry.DeepCopy();
-    new_entry->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
+    new_entry->SetStringWithoutPathExpansion(shill::kProfileProperty,
                                              profile_path);
     entries->SetWithoutPathExpansion(entry_path, new_entry);
   }
@@ -94,8 +94,7 @@ class ShillProfileTestClient {
 
     scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
     base::ListValue* entry_paths = new base::ListValue;
-    result->SetWithoutPathExpansion(flimflam::kEntriesProperty,
-                                    entry_paths);
+    result->SetWithoutPathExpansion(shill::kEntriesProperty, entry_paths);
     for (base::DictionaryValue::Iterator it(*entries); !it.IsAtEnd();
          it.Advance()) {
       entry_paths->AppendString(it.key());
@@ -412,7 +411,7 @@ TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyUpdateManagedNewGUID) {
   // The passphrase isn't sent again, because it's configured by the user and
   // Shill doesn't sent it on GetProperties calls.
   expected_shill_properties->RemoveWithoutPathExpansion(
-      flimflam::kPassphraseProperty, NULL);
+      shill::kPassphraseProperty, NULL);
 
   EXPECT_CALL(mock_profile_client_,
               GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
@@ -448,7 +447,7 @@ TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyReapplyToManaged) {
   // The passphrase isn't sent again, because it's configured by the user and
   // Shill doesn't sent it on GetProperties calls.
   expected_shill_properties->RemoveWithoutPathExpansion(
-      flimflam::kPassphraseProperty, NULL);
+      shill::kPassphraseProperty, NULL);
 
   EXPECT_CALL(mock_profile_client_,
               GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));