Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_util.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 "chromeos/network/network_util.h"
 
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ skipping 86 matching lines @@
     const ListValue& list, std::vector<CellularScanResult>* scan_results) {
   scan_results->clear();
   scan_results->reserve(list.GetSize());
   for (ListValue::const_iterator it = list.begin(); it != list.end(); ++it) {
     if (!(*it)->IsType(base::Value::TYPE_DICTIONARY))
       return false;
     CellularScanResult scan_result;
     const DictionaryValue* dict = static_cast<const DictionaryValue*>(*it);
     // If the network id property is not present then this network cannot be
     // connected to so don't include it in the results.
-    if (!dict->GetStringWithoutPathExpansion(flimflam::kNetworkIdProperty,
+    if (!dict->GetStringWithoutPathExpansion(shill::kNetworkIdProperty,
                                              &scan_result.network_id))
       continue;
-    dict->GetStringWithoutPathExpansion(flimflam::kStatusProperty,
+    dict->GetStringWithoutPathExpansion(shill::kStatusProperty,
                                         &scan_result.status);
-    dict->GetStringWithoutPathExpansion(flimflam::kLongNameProperty,
+    dict->GetStringWithoutPathExpansion(shill::kLongNameProperty,
                                         &scan_result.long_name);
-    dict->GetStringWithoutPathExpansion(flimflam::kShortNameProperty,
+    dict->GetStringWithoutPathExpansion(shill::kShortNameProperty,
                                         &scan_result.short_name);
-    dict->GetStringWithoutPathExpansion(flimflam::kTechnologyProperty,
+    dict->GetStringWithoutPathExpansion(shill::kTechnologyProperty,
                                         &scan_result.technology);
     scan_results->push_back(scan_result);
   }
   return true;
 }
 
 }  // namespace network_util
 }  // namespace chromeos