Some JS cleanup, including proper ownership of ONC properties.

chrome/browser/resources/options/chromeos/onc_data.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview ONC Data support class. Wraps a dictionary object containing
  * ONC managed or unmanaged dictionaries. Supports nested dictionaries,
  * e.g. data.getManagedProperty('VPN.Type').
  */
 cr.define('cr.onc', function() {
   'use strict';
 
   function OncData(data) {
     this.data_ = data;
-    // For convenience set 'type' to the active 'Type' value.
-    this.type = this.getActiveValue('Type');
   }
 
   OncData.prototype = {
 
     /**
      * Returns either a managed property dictionary or an unmanaged value.
      * @param {string} key The property key.
      * @return {*} The property value or dictionary if it exists, otherwise
      *             undefined.
      */
@@ skipping 70 matching lines @@
      * loadTimeData. If no translation exists, returns the untranslated value.
      * @param {string} key The property key.
      * @return {*} The translation if available or the value if not.
      */
     getTranslatedValue: function(key) {
       var value = this.getActiveValue(key);
       if (typeof value != 'string')
         return value;
       var oncString = 'Onc' + key + value;
       // Handle special cases
-      if (key == 'Name' && this.type == 'Ethernet')
+      if (key == 'Name' && this.getActiveValue('Type') == 'Ethernet')
         return loadTimeData.getString('ethernetName');
       if (key == 'VPN.Type' && value == 'L2TP-IPsec') {
         var auth = this.getActiveValue('VPN.IPsec.AuthenticationType');
         if (auth != undefined)
           oncString += auth;
       }
       oncString = oncString.replace(/\./g, '-');
       if (loadTimeData.valueExists(oncString))
         return loadTimeData.getString(oncString);
       return value;
@@ skipping 10 matching lines @@
         return undefined;
       if (property['UserEditable'])
         return property['UserPolicy'];
       if (property['DeviceEditable'])
         return property['DevicePolicy'];
       // No value recommended by policy.
       return undefined;
     },
 
     /**
+     * Updates the properties of |data_| from the properties in |update|.

[pneubeck (no reviews), 2014/09/08 09:18:00]

not sure whether that has the intended effect.
IIUC, usually |this.data_| and |update| are nested dictionaries, in which case
your updating will happen only on the toplevel.

_If_ this is intended, please document it and then this seems also not an ONC
specific function anymore but InternetDetails.js specific.


I guess, this update is only there to keep user modifications?
If so, I think a more reliable solution would be to keep the user modifications
separately and to completely drop the old |onc| and replace it by the newly
received |update|.
You could then reapply the user modifications to |update|, if necessary.

[stevenjb, 2014/09/08 19:43:12]

Eventually this should go away, we really shouldn't support partial ONC updates.
We shouldn't have user modifications that are not supported round trip (and if
we do we should keep them separately as you say).

For now, it should be safe to do top level replacement, i.e. if we update an ONC
entry that has nested dictionaries, we will always update the entire dictionary.


I will add a comment to that effect.

+     * @param {object} update Dictionary containing the updated properties.
+     */
+    updateData: function(update) {
+      for (var prop in update) {
+        if (prop in this.data_)
+          this.data_[prop] = update[prop];
+      }
+    },
+
+    /**
      * Get the effective value from a Managed property ONC dictionary.
      * @param {object} property The managed property ONC dictionary.
      * @return {*} The effective value or undefined.
      * @private
      */
     getEffectiveValueFromProperty_: function(property) {
       if ('Effective' in property) {
         var effective = property.Effective;
         if (effective in property)
           return property[effective];
       }
       return undefined;
     }
   };
 
   return {
     OncData: OncData
   };
 });