Index: chrome/test/data/extensions/api_test/font_settings/standard/test.js |
diff --git a/chrome/test/data/extensions/api_test/font_settings/standard/test.js b/chrome/test/data/extensions/api_test/font_settings/standard/test.js |
index d4f9a46940574325a3039143c351e8943ce2e18b..bc2502fdb06e80d7bd85d091dc66d2a29f6eacde 100644 |
--- a/chrome/test/data/extensions/api_test/font_settings/standard/test.js |
+++ b/chrome/test/data/extensions/api_test/font_settings/standard/test.js |
@@ -21,13 +21,13 @@ chrome.test.runTests([ |
function setPerScriptFont() { |
var script = 'Hang'; |
var genericFamily = 'standard'; |
- var fontName = 'Verdana'; |
+ var fontId = 'Verdana'; |
chrome.test.listenOnce(fs.onFontChanged, function(details) { |
chrome.test.assertEq({ |
script: script, |
genericFamily: genericFamily, |
- fontName: fontName, |
+ fontId: fontId, |
levelOfControl: CONTROLLED_BY_THIS_EXTENSION |
}, details); |
}); |
@@ -35,7 +35,7 @@ chrome.test.runTests([ |
fs.setFont({ |
script: script, |
genericFamily: genericFamily, |
- fontName: fontName |
+ fontId: fontId |
}, chrome.test.callbackPass()); |
}, |
@@ -43,12 +43,12 @@ chrome.test.runTests([ |
// the system. See crbug.com/122303 |
function setGlobalFontName() { |
var genericFamily = 'sansserif'; |
- var fontName = 'Tahoma'; |
+ var fontId = 'Tahoma'; |
chrome.test.listenOnce(fs.onFontChanged, function(details) { |
chrome.test.assertEq({ |
genericFamily: genericFamily, |
- fontName: fontName, |
+ fontId: fontId, |
script: 'Zyyy', |
levelOfControl: CONTROLLED_BY_THIS_EXTENSION |
}, details); |
@@ -56,7 +56,7 @@ chrome.test.runTests([ |
fs.setFont({ |
genericFamily: genericFamily, |
- fontName: fontName |
+ fontId: fontId |
}, chrome.test.callbackPass()); |
}, |
@@ -104,12 +104,12 @@ chrome.test.runTests([ |
function getFontList() { |
var message = 'getFontList should return an array of objects with ' + |
- 'fontName and localizedName properties.'; |
+ 'fontId and displayName properties.'; |
fs.getFontList(chrome.test.callbackPass(function(value) { |
chrome.test.assertTrue(value.length > 0, |
'Font list is not expected to be empty.'); |
- chrome.test.assertEq('string', typeof(value[0].fontName), message); |
- chrome.test.assertEq('string', typeof(value[0].localizedName), message); |
+ chrome.test.assertEq('string', typeof(value[0].fontId), message); |
+ chrome.test.assertEq('string', typeof(value[0].displayName), message); |
})); |
}, |
@@ -118,7 +118,7 @@ chrome.test.runTests([ |
script: 'Hang', |
genericFamily: 'standard' |
}, expect({ |
- fontName: 'Verdana', |
+ fontId: 'Verdana', |
levelOfControl: CONTROLLED_BY_THIS_EXTENSION |
})); |
}, |
@@ -127,7 +127,7 @@ chrome.test.runTests([ |
fs.getFont({ |
genericFamily: 'sansserif' |
}, expect({ |
- fontName: 'Tahoma', |
+ fontId: 'Tahoma', |
levelOfControl: CONTROLLED_BY_THIS_EXTENSION |
})); |
}, |
@@ -165,13 +165,13 @@ chrome.test.runTests([ |
function clearPerScriptFont() { |
var script = 'Hang'; |
var genericFamily = 'standard'; |
- var fontName = 'Tahoma'; |
+ var fontId = 'Tahoma'; |
chrome.test.listenOnce(fs.onFontChanged, function(details) { |
chrome.test.assertEq({ |
script: script, |
genericFamily: genericFamily, |
- fontName: fontName, |
+ fontId: fontId, |
levelOfControl: CONTROLLABLE_BY_THIS_EXTENSION |
}, details); |
}); |
@@ -187,13 +187,13 @@ chrome.test.runTests([ |
function clearGlobalFont() { |
var script = 'Zyyy'; |
var genericFamily = 'sansserif'; |
- var fontName = 'Arial'; |
+ var fontId = 'Arial'; |
chrome.test.listenOnce(fs.onFontChanged, function(details) { |
chrome.test.assertEq({ |
script: script, |
genericFamily: genericFamily, |
- fontName: fontName, |
+ fontId: fontId, |
levelOfControl: CONTROLLABLE_BY_THIS_EXTENSION |
}, details); |
}); |