Fixed bidi RTL check failures on font settings page.

BUG=118420
TEST=browser_tests --gtest_filter=*.TestSettingsFrameFonts


Review URL: http://codereview.chromium.org/9838055

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

chrome/browser/resources/options2/font_settings.js

@@ -170,9 +170,12 @@ cr.define('options', function() {
       for (var i = 0; i < items.length; i++) {
         value = items[i][0];
         text = items[i][1];
+        dir = items[i][2];
         if (text) {
           selected = value == selectedValue;
-          element.appendChild(new Option(text, value, false, selected));
+          var option = new Option(text, value, false, selected);
+          option.dir = dir;
+          element.appendChild(option);
         } else {
           element.appendChild(document.createElement('hr'));
         }

chrome/browser/ui/webui/bidi_checker_web_ui_test.cc

@@ -673,9 +673,8 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
   RunBidiCheckerOnPage(url);
 }
 
-// http://crbug.com/118420
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
-                       DISABLED_TestSettingsFrameFonts) {
+                       TestSettingsFrameFonts) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += "fonts";
   RunBidiCheckerOnPage(url);

chrome/browser/ui/webui/options2/font_settings_handler2.cc

@@ -133,6 +133,18 @@ void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
 
 void FontSettingsHandler::FontsListHasLoaded(
     scoped_ptr<base::ListValue> list) {
+  // Selects the directionality for the fonts in the given list.
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    ListValue* font;
+    bool has_font = list->GetList(i, &font);
+    DCHECK(has_font);
+    string16 value;
+    bool has_value = font->GetString(1, &value);
+    DCHECK(has_value);
+    bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(value);
+    font->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
+  }
+
   ListValue encoding_list;
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
@@ -151,9 +163,10 @@ void FontSettingsHandler::FontsListHasLoaded(
       std::string encoding =
       CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
       string16 name = it->encoding_display_name;
-      base::i18n::AdjustStringForLocaleDirection(&name);
+      bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(name);
       option->Append(Value::CreateStringValue(encoding));
       option->Append(Value::CreateStringValue(name));
+      option->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
     } else {
       // Add empty name/value to indicate a separator item.
       option->Append(Value::CreateStringValue(""));