Some JS cleanup, including proper ownership of ONC properties.

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

Index: chrome/browser/resources/options/chromeos/onc_data.js
diff --git a/chrome/browser/resources/options/chromeos/onc_data.js b/chrome/browser/resources/options/chromeos/onc_data.js
index 78e25a7170f8ae302867cc125c0a0ab4628f5a73..79c0af46e5330d55e84b6d3a72b8b5308456dca7 100644
--- a/chrome/browser/resources/options/chromeos/onc_data.js
+++ b/chrome/browser/resources/options/chromeos/onc_data.js
@@ -12,8 +12,6 @@ cr.define('cr.onc', function() {
 
   function OncData(data) {
     this.data_ = data;
-    // For convenience set 'type' to the active 'Type' value.
-    this.type = this.getActiveValue('Type');
   }
 
   OncData.prototype = {
@@ -104,7 +102,7 @@ cr.define('cr.onc', function() {
         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');
@@ -135,6 +133,17 @@ cr.define('cr.onc', function() {
     },
 
     /**
+     * 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.