Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1800)

Unified Diff: chrome/browser/resources/settings/prefs/prefs.js

Issue 1310843010: Add Polymer tests for cr-settings-prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clarify test Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/prefs/prefs.js
diff --git a/chrome/browser/resources/settings/prefs/prefs.js b/chrome/browser/resources/settings/prefs/prefs.js
index e2ac567c7cb42bbd2fb9a0aba1e182ed31f52529..4d1e7062562064b78318f4a5ee21aeaf9ffe4b1d 100644
--- a/chrome/browser/resources/settings/prefs/prefs.js
+++ b/chrome/browser/resources/settings/prefs/prefs.js
@@ -106,13 +106,19 @@ function ListPrefWrapper(prefObj) {
'prefsChanged_(prefs.*)',
],
+ settingsApi_: chrome.settingsPrivate,
+
/** @override */
- created: function() {
+ ready: function() {
+ // Set window.mockApi to pass a custom settings API, i.e. for tests.
+ // TODO(michaelpg): don't use a global.
+ if (window.mockApi)
+ this.settingsApi_ = window.mockApi;
CrSettingsPrefs.isInitialized = false;
- chrome.settingsPrivate.onPrefsChanged.addListener(
+ this.settingsApi_.onPrefsChanged.addListener(
this.onSettingsPrivatePrefsChanged_.bind(this));
- chrome.settingsPrivate.getAllPrefs(
+ this.settingsApi_.getAllPrefs(
this.onSettingsPrivatePrefsFetched_.bind(this));
},
@@ -139,7 +145,7 @@ function ListPrefWrapper(prefObj) {
if (prefWrapper.equals(this.createPrefWrapper_(prefObj)))
return;
- chrome.settingsPrivate.setPref(
+ this.settingsApi_.setPref(
key,
prefObj.value,
/* pageId */ '',
@@ -181,7 +187,7 @@ function ListPrefWrapper(prefObj) {
// Get the current pref value from chrome.settingsPrivate to ensure the
// UI stays up to date.
- chrome.settingsPrivate.getPref(key, function(pref) {
+ this.settingsApi_.getPref(key, function(pref) {
this.updatePrefs_([pref]);
}.bind(this));
},
« no previous file with comments | « no previous file | chrome/browser/resources/settings/prefs/prefs_types.js » ('j') | chrome/test/data/webui/settings/prefs_tests.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698