Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/policy_util.cc

 // Copyright 2013 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/policy_util.h"
 
 #include "base/logging.h"
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_constants.h"
@@ skipping 136 matching lines @@
 
   // Remove irrelevant fields.
   onc::Normalizer normalizer(true /* remove recommended fields */);
   effective = normalizer.NormalizeObject(&onc::kNetworkConfigurationSignature,
                                          *effective);
 
   scoped_ptr<base::DictionaryValue> shill_dictionary(
       onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
                                      *effective));
 
-  shill_dictionary->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
+  shill_dictionary->SetStringWithoutPathExpansion(shill::kProfileProperty,
                                                   profile.path);
 
   scoped_ptr<NetworkUIData> ui_data;
   if (policy)
     ui_data = NetworkUIData::CreateFromONC(onc_source, *policy);
   else
     ui_data.reset(new NetworkUIData());
 
   if (settings) {
     // Shill doesn't know that sensitive data is contained in the UIData
@@ skipping 24 matching lines @@
        it != policies.end(); ++it) {
     if (IsPolicyMatching(*it->second, actual_network))
       return it->second;
   }
   return NULL;
 }
 
 }  // namespace policy_util
 
 }  // namespace chromeos