Switch prefs.js to Object.observe now that observe-js is no longer a dep.

chrome/browser/resources/settings/prefs/prefs.js

 /* Copyright 2015 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
  * 'cr-settings-prefs' is an element which serves as a model for
  * interaction with settings which are stored in Chrome's
  * Preferences.
  *
@@ skipping 50 matching lines @@
       this.updatePrefs_(prefs, true);
 
       CrSettingsPrefs.isInitialized = true;
       document.dispatchEvent(new Event(CrSettingsPrefs.INITIALIZED));
     },
 
 
     /**
      * Updates the settings model with the given prefs.
      * @param {!Array<!chrome.settingsPrivate.PrefObject>} prefs
      * @param {boolean} shouldObserve Whether to add an ObjectObserver for each

[michaelpg, 2015/05/20 03:25:40]

Reword this, e.g. whether each of the prefs should be observed.

[Jeremy Klein, 2015/05/20 18:06:30]

Done.

      *     of the prefs.
      * @private
      */
     updatePrefs_: function(prefs, shouldObserve) {
       prefs.forEach(function(prefObj) {
         let root = this.prefStore;
         let tokens = prefObj.key.split('.');
 
         assert(tokens.length > 0);
 
         for (let i = 0; i < tokens.length; i++) {
           let token = tokens[i];
 
           if (!root.hasOwnProperty(token)) {
             let path = 'prefStore.' + tokens.slice(0, i + 1).join('.');
             this.setPathValue(path, {});
           }
           root = root[token];
         }
 
         // NOTE: Do this copy rather than just a re-assignment, so that the
         // ObjectObserver fires.

[michaelpg, 2015/05/20 03:25:40]

Reword this

[Jeremy Klein, 2015/05/20 18:06:30]

Done.

         for (let objKey in prefObj) {
           let path = 'prefStore.' + prefObj.key + '.' + objKey;
           this.setPathValue(path, prefObj[objKey]);
         }
 
         if (shouldObserve) {
-          let keyObserver = new ObjectObserver(root);
-          keyObserver.open(
-              this.propertyChangeCallback_.bind(this, prefObj.key));
+          Object.observe(root, this.propertyChangeCallback_, ['update']);
         }
       }, this);
     },
 
     /**
      * Called when a property of a pref changes.
-     * @param {string} propertyPath The path before the property names.
-     * @param {!Array<string>} added An array of keys which were added.
-     * @param {!Array<string>} removed An array of keys which were removed.
-     * @param {!Array<string>} changed An array of keys of properties whose
-     *     values changed.
-     * @param {function(string) : *} getOldValueFn A function which takes a
-     *     property name and returns the old value for that property.
+     * @param {!Array<!Object>} changes An array of objects describing changes.
+     *     @see http://www.html5rocks.com/en/tutorials/es7/observe/
      * @private
      */
-    propertyChangeCallback_: function(
-        propertyPath, added, removed, changed, getOldValueFn) {
-      for (let property in changed) {
+    propertyChangeCallback_: function(changes) {
+      changes.forEach(function(change) {
         // UI should only be able to change the value of a setting for now, not
         // disabled, etc.
-        assert(property == 'value');
+        assert(change.name == 'value');
 
-        let newValue = changed[property];
+        let newValue = change.object[change.name];
         assert(newValue !== undefined);
 
         chrome.settingsPrivate.setPref(
-            propertyPath,
+            change.object['key'],
             newValue,
             /* pageId */ '',
             /* callback */ function() {});
-      }
+      });
     },
   });
 })();