Separating ONC<->Shill translation from the ONC signature.

chrome/browser/chromeos/extensions/networking_private_api.cc

 // Copyright (c) 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 "chrome/browser/chromeos/extensions/networking_private_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "chrome/browser/chromeos/net/managed_network_configuration_handler.h"
@@ skipping 124 matching lines @@
 
 void ResultList::ServicePropertiesCallback(
     const std::string& service_path,
     const std::string& network_type,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& result) {
   if (call_status == DBUS_METHOD_CALL_SUCCESS) {
     scoped_ptr<base::DictionaryValue> onc_properties(
         onc::TranslateShillServiceToONCPart(
             result,
-            &onc::kNetworkConfigurationSignature));
+            &onc::kNetworkWithStateSignature));
 
     scoped_ptr<api::NetworkProperties> filtered_result(
         CreateFilteredResult(*onc_properties));
 
     std::string onc_type;
     if (filtered_result->additional_properties.GetString(
         onc::network_config::kType, &onc_type) &&
         (onc_type == network_type ||
          network_type == onc::network_type::kAllTypes)) {
       // TODO(gspencer): For now the "GUID" we send back is going to look
@@ skipping 43 matching lines @@
   return true;
 }
 
 void NetworkingPrivateGetPropertiesFunction::ResultCallback(
     const std::string& service_path,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& result) {
   scoped_ptr<base::DictionaryValue> onc_properties(
       onc::TranslateShillServiceToONCPart(
           result,
-          &onc::kNetworkConfigurationSignature));
+          &onc::kNetworkWithStateSignature));
   GetPropertiesSuccess(service_path,
                        *onc_properties);
 }
 
 void NetworkingPrivateGetPropertiesFunction::GetPropertiesSuccess(
     const std::string& service_path,
     const base::DictionaryValue& dictionary) {
   scoped_ptr<api::NetworkProperties> filtered_result(
       CreateFilteredResult(dictionary));
   filtered_result->additional_properties.SetStringWithoutPathExpansion(
@@ skipping 228 matching lines @@
     const std::string& result) {
   results_ = api::VerifyAndEncryptData::Results::Create(result);
   SendResponse(true);
 }
 
 void NetworkingPrivateVerifyAndEncryptDataFunction::ErrorCallback(
     const std::string& error_name, const std::string& error) {
   error_ = error_name;
   SendResponse(false);
 }