Use manifest version 2 for font settings sample extension.

chrome/common/extensions/docs/extensions/samples.html

Index: chrome/common/extensions/docs/extensions/samples.html
diff --git a/chrome/common/extensions/docs/extensions/samples.html b/chrome/common/extensions/docs/extensions/samples.html
index e4cc0ddb4876f80db4e7c99641f4923093b43d61..be03019e8ad34de36536f01c0efacb6bb61b72da 100644
--- a/chrome/common/extensions/docs/extensions/samples.html
+++ b/chrome/common/extensions/docs/extensions/samples.html
@@ -222,7 +222,7 @@
   "26115f23aef245d6757587e3e517bbe4b3bc55fe": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE ALARMS BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.DECLARATIVEWEBREQUEST.ONREQUEST CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.RUNTIME.ONINSTALLED CHROME.RUNTIME.ONSUSPEND CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
   "763a08e9b06595d785568a8d392b95a2f3700258": "EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BROWSER_ACTION",
   "4efa12eaaa442b6b7c880e7a38ceeb0cff7e8b77": "FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE TABS CHROME.DEVTOOLS.NETWORK.GETHAR CHROME.DEVTOOLS.NETWORK.ONREQUESTFINISHED CHROME.TABS.EXECUTESCRIPT",
-  "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS POPUP CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
+  "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
   "8b0dd31216235941bdd8eb33fda915ef5cf79a82": "GOOGLE CALENDAR CHECKER (BY GOOGLE) QUICKLY SEE THE TIME UNTIL YOUR NEXT MEETING FROM ANY OF YOUR CALENDARS. CLICK ON THE BUTTON TO BE TAKEN TO YOUR CALENDAR. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
   "4e35caa9742fb82dbd628892d23a781614f6eff6": "GOOGLE DOCUMENT LIST VIEWER DEMONSTRATES HOW TO USE OAUTH TO CONNECT THE GOOGLE DOCUMENTS LIST DATA API. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE",
   "bb57f7a0132cbeb36ad7e7bb0ab75c21704234ca": "GOOGLE MAIL CHECKER DISPLAYS THE NUMBER OF UNREAD MESSAGES IN YOUR GOOGLE MAIL INBOX. YOU CAN ALSO CLICK THE BUTTON TO OPEN YOUR INBOX. ALARMS BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
@@ -1567,12 +1567,10 @@
   </h2>
   <p class="metadata features">Uses
     <span>
-      <strong>browser_action</strong><span>, </span>
-    </span><span>
-      <strong>fontSettings</strong>
+      <strong>browser_action</strong>
       <span> and</span>
     </span><span>
-      <strong>popup</strong>
+      <strong>fontSettings</strong>
     </span>
   </p>
   <p>Sample extension for Font Settings API</p>