[Font Settings API]: Rename fontName and localizedName to fontId and displayName

This should make the API a little more clear.

BUG=114148
TEST=browser tests and sample extension still work

Review URL: https://chromiumcodereview.appspot.com/10716003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146295 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 24 deletions

diff --git a/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js b/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js
index 4c3a04e..96bc8b7 100644
--- a/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js
+++ b/chrome/test/data/extensions/api_test/font_settings/incognito/launch.js
@@ -21,22 +21,22 @@ chrome.test.runTests([
   function setPerScriptFont() {
     var script = 'Hang';
     var genericFamily = 'standard';
-    var fontName = 'Verdana';
+    var fontId = 'Verdana';
 
     fs.setFont({
       script: script,
       genericFamily: genericFamily,
-      fontName: fontName
+      fontId: fontId
     }, chrome.test.callbackFail(SET_FROM_INCOGNITO_ERROR));
   },
 
   function setGlobalFontName() {
     var genericFamily = 'sansserif';
-    var fontName = 'Tahoma';
+    var fontId = 'Tahoma';
 
     fs.setFont({
       genericFamily: genericFamily,
-      fontName: fontName
+      fontId: fontId
     }, chrome.test.callbackFail(SET_FROM_INCOGNITO_ERROR));
   },
 
@@ -50,12 +50,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);
     }));
   },
 
@@ -64,7 +64,7 @@ chrome.test.runTests([
       script: 'Hang',
       genericFamily: 'standard'
     }, expect({
-      fontName: 'Tahoma',
+      fontId: 'Tahoma',
       levelOfControl: CONTROLLABLE_BY_THIS_EXTENSION
     }));
   },
@@ -73,7 +73,7 @@ chrome.test.runTests([
     fs.getFont({
       genericFamily: 'sansserif'
     }, expect({
-      fontName: 'Arial',
+      fontId: 'Arial',
       levelOfControl: CONTROLLABLE_BY_THIS_EXTENSION
     }));
   },
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 d4f9a46..bc2502f 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);
     });