Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_cert_migrator.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/network_cert_migrator.h"
 
 #include <cert.h>
 #include <string>
 
 #include "base/location.h"
@@ skipping 113 matching lines @@
                               std::string* pem_key,
                               const base::ListValue** pem_property,
                               std::string* nickname,
                               UMANetworkType* uma_type) {
     struct NssPem {
       const char* read_prefix;
       const char* nss_key;
       const char* pem_key;
       UMANetworkType uma_type;
     } const kNssPemMap[] = {
-        { NULL, flimflam::kEapCaCertNssProperty, shill::kEapCaCertPemProperty,
+        { NULL, shill::kEapCaCertNssProperty, shill::kEapCaCertPemProperty,
          UMA_NETWORK_TYPE_EAP },
-        { flimflam::kProviderProperty, flimflam::kL2tpIpsecCaCertNssProperty,
+        { shill::kProviderProperty, shill::kL2tpIpsecCaCertNssProperty,
          shill::kL2tpIpsecCaCertPemProperty, UMA_NETWORK_TYPE_IPSEC },
-        { flimflam::kProviderProperty, flimflam::kOpenVPNCaCertNSSProperty,
+        { shill::kProviderProperty, shill::kOpenVPNCaCertNSSProperty,
          shill::kOpenVPNCaCertPemProperty, UMA_NETWORK_TYPE_OPENVPN },
     };
 
     for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kNssPemMap); ++i) {
       const base::DictionaryValue* dict = &shill_properties;
       if (kNssPemMap[i].read_prefix) {
         shill_properties.GetDictionaryWithoutPathExpansion(
             kNssPemMap[i].read_prefix, &dict);
         if (!dict)
           continue;
@@ skipping 119 matching lines @@
 
 void NetworkCertMigrator::OnCertificatesLoaded(
     const net::CertificateList& cert_list,
     bool initial_load) {
   // Maybe there are networks referring to certs (by NSS nickname) that were not
   // loaded before but are now.
   NetworkListChanged();
 }
 
 }  // namespace chromeos