Translate Wimax from Shill -> ONC, fix JS Wimax strings.

chromeos/network/onc/onc_translator_shill_to_onc.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/onc/onc_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
@@ skipping 61 matching lines @@
   // Translates the associated Shill dictionary and creates an ONC object of the
   // given signature.
   scoped_ptr<base::DictionaryValue> CreateTranslatedONCObject();
 
  private:
   void TranslateEthernet();
   void TranslateOpenVPN();
   void TranslateIPsec();
   void TranslateVPN();
   void TranslateWiFiWithState();
+  void TranslateWiMAXWithState();
   void TranslateCellularWithState();
   void TranslateCellularDevice();
   void TranslateNetworkWithState();
   void TranslateIPConfig();
   void TranslateSavedOrStaticIPConfig(const std::string& nameserver_property);
   void TranslateSavedIPConfig();
   void TranslateStaticIPConfig();
 
   // Creates an ONC object from |dictionary| according to the signature
   // associated to |onc_field_name| and adds it to |onc_object_| at
@@ skipping 61 matching lines @@
   } else if (onc_signature_ == &kEthernetSignature) {
     TranslateEthernet();
   } else if (onc_signature_ == &kVPNSignature) {
     TranslateVPN();
   } else if (onc_signature_ == &kOpenVPNSignature) {
     TranslateOpenVPN();
   } else if (onc_signature_ == &kIPsecSignature) {
     TranslateIPsec();
   } else if (onc_signature_ == &kWiFiWithStateSignature) {
     TranslateWiFiWithState();
+  } else if (onc_signature_ == &kWiMAXWithStateSignature) {
+    TranslateWiMAXWithState();
   } else if (onc_signature_ == &kCellularWithStateSignature) {
     if (field_translation_table_ == kCellularDeviceTable)
       TranslateCellularDevice();
     else
       TranslateCellularWithState();
   } else if (onc_signature_ == &kIPConfigSignature) {
     TranslateIPConfig();
   } else if (onc_signature_ == &kSavedIPConfigSignature) {
     TranslateSavedIPConfig();
   } else if (onc_signature_ == &kStaticIPConfigSignature) {
@@ skipping 137 matching lines @@
 }
 
 void ShillToONCTranslator::TranslateWiFiWithState() {
   TranslateWithTableAndSet(
       shill::kSecurityProperty, kWiFiSecurityTable, ::onc::wifi::kSecurity);
   std::string ssid = shill_property_util::GetSSIDFromProperties(
       *shill_dictionary_, NULL /* ignore unknown encoding */);
   if (!ssid.empty())
     onc_object_->SetStringWithoutPathExpansion(::onc::wifi::kSSID, ssid);
   CopyPropertiesAccordingToSignature();
+  TranslateAndAddNestedObject(::onc::wifi::kEAP);
+}
+
+void ShillToONCTranslator::TranslateWiMAXWithState() {
+  CopyPropertiesAccordingToSignature();
+  TranslateAndAddNestedObject(::onc::wimax::kEAP);
 }
 
 void ShillToONCTranslator::TranslateCellularWithState() {
   CopyPropertiesAccordingToSignature();
   TranslateWithTableAndSet(shill::kActivationStateProperty,
                            kActivationStateTable,
                            ::onc::cellular::kActivationState);
   TranslateWithTableAndSet(shill::kRoamingStateProperty,
                            kRoamingStateTable,
                            ::onc::cellular::kRoamingState);
@@ skipping 336 matching lines @@
     ::onc::ONCSource onc_source,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos