summaryrefslogtreecommitdiffstats
path: root/chrome/test/data
diff options
context:
space:
mode:
authorfalken@google.com <falken@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 04:04:19 +0000
committerfalken@google.com <falken@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 04:04:19 +0000
commitb5bc3c5d199bb95adeaa01e98790d5da9fa338f0 (patch)
tree786c934783b9c543939f52c0d306f1ef4b0c896c /chrome/test/data
parentf5334fe4ac477002fba75e01dde8cfcc9526cc19 (diff)
downloadchromium_src-b5bc3c5d199bb95adeaa01e98790d5da9fa338f0.zip
chromium_src-b5bc3c5d199bb95adeaa01e98790d5da9fa338f0.tar.gz
chromium_src-b5bc3c5d199bb95adeaa01e98790d5da9fa338f0.tar.bz2
[Font Settings API]: Remove default charset from API.
As suggested by Jungshik. Although charset is currently one of the settings in the built-in font options UI, it is not really a font setting and doesn't belong there or in the API. BUG=114148 TEST= Review URL: https://chromiumcodereview.appspot.com/10535142 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
-rw-r--r--chrome/test/data/extensions/api_test/font_settings/standard/test.js35
1 files changed, 1 insertions, 34 deletions
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 f6fdd54..d4f9a46 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
@@ -102,20 +102,6 @@ chrome.test.runTests([
}, chrome.test.callbackPass());
},
- function setDefaultCharacterSet() {
- var charset = 'GBK';
- chrome.test.listenOnce(fs.onDefaultCharacterSetChanged, function(details) {
- chrome.test.assertEq({
- charset: charset,
- levelOfControl: CONTROLLED_BY_THIS_EXTENSION
- }, details);
- });
-
- fs.setDefaultCharacterSet({
- charset: charset
- }, chrome.test.callbackPass());
- },
-
function getFontList() {
var message = 'getFontList should return an array of objects with ' +
'fontName and localizedName properties.';
@@ -174,13 +160,6 @@ chrome.test.runTests([
}));
},
- function getDefaultCharacterSet() {
- fs.getDefaultCharacterSet({}, expect({
- charset: 'GBK',
- levelOfControl: CONTROLLED_BY_THIS_EXTENSION
- }));
- },
-
// This test may fail on Windows if the font is not installed on the
// system. See crbug.com/122303
function clearPerScriptFont() {
@@ -258,17 +237,5 @@ chrome.test.runTests([
});
fs.clearMinimumFontSize({}, chrome.test.callbackPass());
- },
-
- function clearDefaultCharacterSet() {
- var charset = 'Shift_JIS';
- chrome.test.listenOnce(fs.onDefaultCharacterSetChanged, function(details) {
- chrome.test.assertEq({
- charset: charset,
- levelOfControl: CONTROLLABLE_BY_THIS_EXTENSION
- }, details);
- });
-
- fs.clearDefaultCharacterSet({}, chrome.test.callbackPass());
- },
+ }
]);