Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/onc/onc_translator_onc_to_shill.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.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
@@ skipping 88 matching lines @@
     TranslateEAP();
   else
     CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateEthernet() {
   std::string authentication;
   onc_object_->GetStringWithoutPathExpansion(ethernet::kAuthentication,
                                              &authentication);
 
-  const char* shill_type = flimflam::kTypeEthernet;
+  const char* shill_type = shill::kTypeEthernet;
   if (authentication == ethernet::k8021X)
     shill_type = shill::kTypeEthernetEap;
-  shill_dictionary_->SetStringWithoutPathExpansion(flimflam::kTypeProperty,
+  shill_dictionary_->SetStringWithoutPathExpansion(shill::kTypeProperty,
                                                    shill_type);
 
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateOpenVPN() {
   // Shill supports only one RemoteCertKU but ONC a list.
   // Copy only the first entry if existing.
   const base::ListValue* certKUs = NULL;
   std::string certKU;
   if (onc_object_->GetListWithoutPathExpansion(openvpn::kRemoteCertKU,
                                                &certKUs) &&
       certKUs->GetString(0, &certKU)) {
     shill_dictionary_->SetStringWithoutPathExpansion(
-        flimflam::kOpenVPNRemoteCertKUProperty, certKU);
+        shill::kOpenVPNRemoteCertKUProperty, certKU);
   }
 
   for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     scoped_ptr<base::Value> translated;
     if (it.key() == vpn::kSaveCredentials ||
         it.key() == openvpn::kRemoteCertKU ||
         it.key() == openvpn::kServerCAPEMs) {
       translated.reset(it.value().DeepCopy());
     } else {
       // Shill wants all Provider/VPN fields to be strings.
       translated = ConvertValueToString(it.value());
     }
     AddValueAccordingToSignature(it.key(), translated.Pass());
   }
 }
 
 void LocalTranslator::TranslateVPN() {
   std::string type;
   onc_object_->GetStringWithoutPathExpansion(vpn::kType, &type);
-  TranslateWithTableAndSet(type, kVPNTypeTable,
-                           flimflam::kProviderTypeProperty);
+  TranslateWithTableAndSet(type, kVPNTypeTable, shill::kProviderTypeProperty);
 
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateWiFi() {
   std::string security;
   onc_object_->GetStringWithoutPathExpansion(wifi::kSecurity, &security);
   TranslateWithTableAndSet(security, kWiFiSecurityTable,
-                           flimflam::kSecurityProperty);
+                           shill::kSecurityProperty);
 
   // We currently only support managed and no adhoc networks.
-  shill_dictionary_->SetStringWithoutPathExpansion(flimflam::kModeProperty,
-                                                   flimflam::kModeManaged);
+  shill_dictionary_->SetStringWithoutPathExpansion(shill::kModeProperty,
+                                                   shill::kModeManaged);
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateEAP() {
   std::string outer;
   onc_object_->GetStringWithoutPathExpansion(eap::kOuter, &outer);
-  TranslateWithTableAndSet(outer, kEAPOuterTable, flimflam::kEapMethodProperty);
+  TranslateWithTableAndSet(outer, kEAPOuterTable, shill::kEapMethodProperty);
 
   // Translate the inner protocol only for outer tunneling protocols.
   if (outer == eap::kPEAP || outer == eap::kEAP_TTLS) {
     // In ONC the Inner protocol defaults to "Automatic".
     std::string inner = eap::kAutomatic;
     // ONC's Inner == "Automatic" translates to omitting the Phase2 property in
     // Shill.
     onc_object_->GetStringWithoutPathExpansion(eap::kInner, &inner);
     if (inner != eap::kAutomatic) {
       const StringTranslationEntry* table =
           outer == eap::kPEAP ? kEAP_PEAP_InnerTable : kEAP_TTLS_InnerTable;
-      TranslateWithTableAndSet(inner, table, flimflam::kEapPhase2AuthProperty);
+      TranslateWithTableAndSet(inner, table, shill::kEapPhase2AuthProperty);
     }
   }
 
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateNetworkConfiguration() {
   std::string type;
   onc_object_->GetStringWithoutPathExpansion(network_config::kType, &type);
 
   // Set the type except for Ethernet which is set in TranslateEthernet.
   if (type != network_type::kEthernet)
-    TranslateWithTableAndSet(type, kNetworkTypeTable, flimflam::kTypeProperty);
+    TranslateWithTableAndSet(type, kNetworkTypeTable, shill::kTypeProperty);
 
   // Shill doesn't allow setting the name for non-VPN networks.
   if (type == network_type::kVPN) {
     std::string name;
     onc_object_->GetStringWithoutPathExpansion(network_config::kName, &name);
-    shill_dictionary_->SetStringWithoutPathExpansion(flimflam::kNameProperty,
+    shill_dictionary_->SetStringWithoutPathExpansion(shill::kNameProperty,
                                                      name);
   }
 
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::CopyFieldsAccordingToSignature() {
   for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     AddValueAccordingToSignature(it.key(),
@@ skipping 81 matching lines @@
     const OncValueSignature* onc_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos