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|.
+     * Note: this only looks at top level entries, so if a dictionary is
+     * updated the entire dictionary is written over. TODO(stevenjb):
+     * eliminate this function when |data_| contains only ONC entries and
+     * any updates consist of complete ONC dictionaries.
+     * @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
   };
 });