Copy changes in r115955 from options to options2

chrome/browser/resources/options2/font_settings.html

Index: chrome/browser/resources/options2/font_settings.html
diff --git a/chrome/browser/resources/options2/font_settings.html b/chrome/browser/resources/options2/font_settings.html
index c025230bcbb3b0e59554df19d732bc10c6658c1a..8286cb058d15d6436d4f0c213d7e7ffabee0330b 100644
--- a/chrome/browser/resources/options2/font_settings.html
+++ b/chrome/browser/resources/options2/font_settings.html
@@ -5,7 +5,7 @@
     <div class="font-input-div">
       <div>
         <select id="standard-font-family" class="font-input" data-type="string"
-            pref="webkit.webprefs.standard_font_family"
+            pref="webkit.webprefs.global.standard_font_family"
             metric="Options_ChangeStandardFont"></select>
       </div>
       <div>
@@ -25,7 +25,7 @@
     <div class="font-input-div">
       <div>
         <select id="serif-font-family" class="font-input" data-type="string"
-            pref="webkit.webprefs.serif_font_family"
+            pref="webkit.webprefs.global.serif_font_family"
             metric="Options_ChangeSerifFont"></select>
       </div>
     </div>
@@ -37,7 +37,7 @@
       <div>
         <select id="sans-serif-font-family" class="font-input"
             data-type="string"
-            pref="webkit.webprefs.sansserif_font_family"
+            pref="webkit.webprefs.global.sansserif_font_family"
             metric="Options_ChangeSansSerifFont"></select>
       </div>
     </div>
@@ -48,7 +48,7 @@
     <div class="font-input-div">
       <div>
         <select id="fixed-font-family" class="font-input" data-type="string"
-            pref="webkit.webprefs.fixed_font_family"
+            pref="webkit.webprefs.global.fixed_font_family"
             metric="Options_ChangeFixedFont"></select>
       </div>
     </div>
@@ -59,7 +59,7 @@
     <div class="font-input-div">
       <div>
         <input id="minimum-font-size" type="range" min="0" max="15"
-            pref="webkit.webprefs.minimum_font_size">
+            pref="webkit.webprefs.global.minimum_font_size">
         <div>
           <span i18n-content="fontSettingsSizeTiny"></span>
           <span i18n-content="fontSettingsSizeHuge" class="font-settings-huge">
@@ -74,7 +74,7 @@
     <div class="font-input-div">
       <div>
         <select id="font-encoding" data-type="string"
-            pref="intl.charset_default"
+            pref="intl.global.charset_default"
             metric="Options_ChangeFontEncoding"></select>
       </div>
     </div>