ONC: Fix Static-/Saved-/IPConfig.

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 448 matching lines @@
   if (Tokenize(shill_nameservers, ",", &onc_nameserver_vector) > 0) {
     scoped_ptr<base::ListValue> onc_nameservers(new base::ListValue);
     for (std::vector<std::string>::iterator iter =
              onc_nameserver_vector.begin();
          iter != onc_nameserver_vector.end(); ++iter) {
       onc_nameservers->AppendString(*iter);
     }
     onc_object_->SetWithoutPathExpansion(::onc::ipconfig::kNameServers,
                                          onc_nameservers.release());
   }
+  // Static and Saved IPConfig in Shill are always of type IPv4. Set this type
+  // in ONC, but not if the object would be empty except the type.
+  if (!onc_object_->empty()) {
+    onc_object_->SetStringWithoutPathExpansion(::onc::ipconfig::kType,
+                                               ::onc::ipconfig::kIPv4);
+  }
 }
 
 void ShillToONCTranslator::TranslateSavedIPConfig() {
   TranslateSavedOrStaticIPConfig(shill::kSavedIPNameServersProperty);
 }
 
 void ShillToONCTranslator::TranslateStaticIPConfig() {
   TranslateSavedOrStaticIPConfig(shill::kStaticIPNameServersProperty);
 }
 
@@ skipping 142 matching lines @@
     const base::DictionaryValue& shill_dictionary,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos