Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_util_unittest.cc

Index: chromeos/network/network_util_unittest.cc
diff --git a/chromeos/network/network_util_unittest.cc b/chromeos/network/network_util_unittest.cc
index 17c09bbfec87f1d643bd8c54c391b186a28def48..f668cf30c66d2c4e23b1c528f29d817ceff6990b 100644
--- a/chromeos/network/network_util_unittest.cc
+++ b/chromeos/network/network_util_unittest.cc
@@ -117,22 +117,22 @@ TEST_F(NetworkUtilTest, ParseScanResults) {
   // Scan result has no network id.
   list.Clear();
   DictionaryValue* dict_value = new DictionaryValue();
-  dict_value->SetString(flimflam::kStatusProperty, "available");
+  dict_value->SetString(shill::kStatusProperty, "available");
   list.Append(dict_value);
   EXPECT_TRUE(ParseCellularScanResults(list, &scan_results));
   EXPECT_TRUE(scan_results.empty());
 
   // Mixed parse results.
   dict_value = new DictionaryValue();
-  dict_value->SetString(flimflam::kNetworkIdProperty, "000001");
-  dict_value->SetString(flimflam::kStatusProperty, "unknown");
-  dict_value->SetString(flimflam::kTechnologyProperty, "GSM");
+  dict_value->SetString(shill::kNetworkIdProperty, "000001");
+  dict_value->SetString(shill::kStatusProperty, "unknown");
+  dict_value->SetString(shill::kTechnologyProperty, "GSM");
   list.Append(dict_value);
 
   dict_value = new DictionaryValue();
-  dict_value->SetString(flimflam::kNetworkIdProperty, "000002");
-  dict_value->SetString(flimflam::kStatusProperty, "available");
-  dict_value->SetString(flimflam::kLongNameProperty, "Long Name");
+  dict_value->SetString(shill::kNetworkIdProperty, "000002");
+  dict_value->SetString(shill::kStatusProperty, "available");
+  dict_value->SetString(shill::kLongNameProperty, "Long Name");
   list.Append(dict_value);
 
   EXPECT_TRUE(ParseCellularScanResults(list, &scan_results));