Adding more bidichecker tests and doing some minor cleanups.

chrome/browser/ui/webui/bidi_checker_web_ui_test.cc

Index: chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index 5eef27045283b9ea191e6f00a458fa88d65652f7..b22612cee691ca2c258ab0bb6e6cf4be1fefd036 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/url_constants.h"
@@ -57,13 +59,21 @@ void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(const char pageURL[],
                                 Value::CreateBooleanValue(isRTL)));
 }
 
-// WebUIBidiCheckerBrowserTestFakeBidi
+// WebUIBidiCheckerBrowserTestLTR
 
-WebUIBidiCheckerBrowserTestFakeBidi::~WebUIBidiCheckerBrowserTestFakeBidi() {}
+void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage(
+    const char pageURL[]) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, false);
+}
 
-WebUIBidiCheckerBrowserTestFakeBidi::WebUIBidiCheckerBrowserTestFakeBidi() {}
+// WebUIBidiCheckerBrowserTestFakeBidi

[jeremy, 2011/10/25 09:19:53]

I think you can remove this and the above comment.

[ofri1, 2011/10/30 09:42:40]

Done.

 
-void WebUIBidiCheckerBrowserTestFakeBidi::SetUpOnMainThread() {
+void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
+    const char pageURL[]) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, true);
+}
+
+void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
   FilePath pak_path;
   app_locale_ = base::i18n::GetConfiguredLocale();
@@ -80,7 +90,7 @@ void WebUIBidiCheckerBrowserTestFakeBidi::SetUpOnMainThread() {
 #endif
 }
 
-void WebUIBidiCheckerBrowserTestFakeBidi::CleanUpOnMainThread() {
+void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::CleanUpOnMainThread();
 #if defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)
   gtk_widget_set_default_direction(GTK_TEXT_DIR_LTR);
@@ -92,139 +102,154 @@ void WebUIBidiCheckerBrowserTestFakeBidi::CleanUpOnMainThread() {
 
 // Tests
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestMainHistoryPageLTR) {
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestMainHistoryPage) {
   HistoryService* history_service =
       browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);

[jeremy, 2011/10/25 09:19:53]

Can you split the setup code out into a common function so that you don't have
code duplication between this and the RTL case.

[ofri1, 2011/10/30 09:42:40]

Done.

-  GURL history_url = GURL("http://www.ynet.co.il");
+  const GURL history_url = GURL("http://www.ynet.co.il");
   history_service->AddPage(history_url, history::SOURCE_BROWSED);
   string16 title;
   ASSERT_TRUE(UTF8ToUTF16("\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x21",
                           12,

[jeremy, 2011/10/25 09:19:53]

Why can't you use the single argument version of UTF8ToUTF16() like the RTL
case? Also probably better to use array_size() rather than hardcoding string
length.

[ofri1, 2011/10/30 09:42:40]

Done.

                           &title));
   history_service->SetPageTitle(history_url, title);
-  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL, false);
+  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestMainHistoryPageRTL) {
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestMainHistoryPage) {
   HistoryService* history_service =
       browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
-  GURL history_url = GURL("http://www.google.com");
+  const GURL history_url = GURL("http://www.google.com");
   history_service->AddPage(history_url, history::SOURCE_BROWSED);
   string16 title = UTF8ToUTF16("Google");
   history_service->SetPageTitle(history_url, title);
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL,
-                                                    true);
+  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL);
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestAboutPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUIAboutURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestAboutPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUIAboutURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestBugReportPage) {
+  // The bugreport page receives its contents as GET arguments. Here we provide
+  // a custom, Hebrew typed, description message.
+  RunBidiCheckerOnPage(
+      "chrome://bugreport#0?description=%D7%91%D7%93%D7%99%D7%A7%D7%94&issueType=1");

[jeremy, 2011/10/25 09:19:53]

"foo"
"bar"

[ofri1, 2011/10/30 09:42:40]

Done.

 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestBugReportPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUIBugReportURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestBugReportPage) {
+  RunBidiCheckerOnPage("chrome://bugreport#0?description=test&issueType=1");
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestCrashesPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestCrashesPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestCrashesPageRTL) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUICrashesURL,
-                                                    true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestCrashesPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestDownloadsPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestDownloadsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestDownloadsPageRTL) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
-      chrome::kChromeUIDownloadsURL, true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestDownloadsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestNewTabPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestNewTabPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL);
 }
 
 // http://crbug.com/97453
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       DISABLED_TestNewTabPageRTL) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUINewTabURL,
-                                                    true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       DISABLED_TestNewTabPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestPluginsPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestPluginsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestPluginsPageRTL) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL,
-                                                    true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestPluginsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestSettingsPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL, false);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestSettingsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestSettingsPageRTL) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
-      chrome::kChromeUISettingsURL, true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestSettingsPage) {
+  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL);
 }
 
 #if defined(OS_MACOSX)
 // http://crbug.com/94642

[jeremy, 2011/10/25 09:19:53]

Any updates on this bug?

[ofri1, 2011/10/30 09:42:40]

Checking.

-#define MAYBE_TestSettingsAutofillPageLTR FLAKY_TestSettingsAutofillPageLTR
+#define MAYBE_TestSettingsAutofillPage FLAKY_TestSettingsAutofillPage
 #elif defined(OS_WIN)
 // http://crbug.com/95425
-#define MAYBE_TestSettingsAutofillPageLTR FAILS_TestSettingsAutofillPageLTR
+#define MAYBE_TestSettingsAutofillPage FAILS_TestSettingsAutofillPage
 #else
-#define MAYBE_TestSettingsAutofillPageLTR TestSettingsAutofillPageLTR
+#define MAYBE_TestSettingsAutofillPage TestSettingsAutofillPage
 #endif  // defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest,
-                       MAYBE_TestSettingsAutofillPageLTR) {
-  std::string url(chrome::kChromeUISettingsURL);
-  url += std::string(chrome::kAutofillSubPage);
-
-  autofill_test::DisableSystemServices(browser()->profile());
-  AutofillProfile profile;
-  autofill_test::SetProfileInfo(
-      &profile,
-      "\xD7\x9E\xD7\xA9\xD7\x94",
-      "\xD7\x91",
-      "\xD7\x9B\xD7\x94\xD7\x9F",
-      "moshe.b.cohen@biditest.com",
-      "\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x20\xD7\x91\xD7\xA2\xD7\x9E",
-      "\xD7\x93\xD7\xA8\xD7\x9A\x20\xD7\x9E\xD7\xA0\xD7\x97\xD7\x9D\x20\xD7\x91\xD7\x92\xD7\x99\xD7\x9F\x20\x32\x33",
-      "\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36",
-      "\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99\xD7\x91",
-      "",
-      "66183",
-      "\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C",
-      "0000");
 
+static void SetupTestSettingsAutofillPage(Profile* profile,
+                                          const char* first_name,
+                                          const char* middle_name,
+                                          const char* last_name,
+                                          const char* email,
+                                          const char* company,
+                                          const char* address1,
+                                          const char* address2,
+                                          const char* city,
+                                          const char* state,
+                                          const char* zipcode,
+                                          const char* country,
+                                          const char* phone) {
+  autofill_test::DisableSystemServices(profile);
+  AutofillProfile autofill_profile;
+  autofill_test::SetProfileInfo(&autofill_profile,
+                                first_name,
+                                middle_name,
+                                last_name,
+                                email,
+                                company,
+                                address1,
+                                address2,
+                                city,
+                                state,
+                                zipcode,
+                                country,
+                                phone);
   PersonalDataManager* personal_data_manager =
-    PersonalDataManagerFactory::GetForProfile(browser()->profile());
+  PersonalDataManagerFactory::GetForProfile(profile);

[jeremy, 2011/10/25 09:19:53]

indent

[ofri1, 2011/10/30 09:42:40]

Done.

   ASSERT_TRUE(personal_data_manager);
-
-  personal_data_manager->AddProfile(profile);
-
-  RunBidiCheckerOnPage(url.c_str(), false);
+  personal_data_manager->AddProfile(autofill_profile);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
-                       TestSettingsAutofillPageRTL) {
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       MAYBE_TestSettingsAutofillPage) {
+  SetupTestSettingsAutofillPage(browser()->profile(),
+                                "\xD7\x9E\xD7\xA9\xD7\x94",
+                                "\xD7\x91",
+                                "\xD7\x9B\xD7\x94\xD7\x9F",
+                                "moshe.b.cohen@biditest.com",
+                                "\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x20\xD7\x91\xD7\xA2\xD7\x9E",

[ofri1, 2011/10/30 09:42:40]

Done.

+                                "\xD7\x93\xD7\xA8\xD7\x9A\x20\xD7\x9E\xD7\xA0\xD7\x97\xD7\x9D\x20\xD7\x91\xD7\x92\xD7\x99\xD7\x9F\x20\x32\x33",
+                                "\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36",
+                                "\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99\xD7\x91",
+                                "",
+                                "66183",
+                                "\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C",
+                                "0000");
   std::string url(chrome::kChromeUISettingsURL);
   url += std::string(chrome::kAutofillSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
 
-  autofill_test::DisableSystemServices(browser()->profile());
-  AutofillProfile profile;
-  autofill_test::SetProfileInfo(
-                                &profile,
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsAutofillPage) {

[jeremy, 2011/10/25 09:19:53]

MAYBE_Test... ?

[ofri1, 2011/10/30 09:42:40]

No problem with the RTL version

+  SetupTestSettingsAutofillPage(browser()->profile(),
                                 "Milton",
                                 "C.",
                                 "Waddams",
@@ -237,12 +262,118 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
                                 "78744",
                                 "United States",
                                 "5125551234");
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kAutofillSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
 
-  PersonalDataManager* personal_data_manager =
-      PersonalDataManagerFactory::GetForProfile(browser()->profile());
-  ASSERT_TRUE(personal_data_manager);
+static void SetupTestSettingsBrowserOptions(Profile* profile,
+                                            const GURL url,
+                                            const std::string title) {
+  // First, add a history entry for the site. This is needed so the site's
+  // name will appear in the startup sites lists.
+  HistoryService* history_service =
+      profile->GetHistoryService(Profile::IMPLICIT_ACCESS);
+  history_service->AddPage(url, history::SOURCE_BROWSED);
+  history_service->SetPageTitle(url, UTF8ToUTF16(title));
+  // Next, add the site to the startup sites
+  PrefService* prefs = profile->GetPrefs();
+  SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
+  pref.urls.push_back(url);
+  SessionStartupPref::SetStartupPref(prefs, pref);
+}
 
-  personal_data_manager->AddProfile(profile);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsBorwserOptionsPage) {

[jeremy, 2011/10/25 09:19:53]

*Browser

[ofri1, 2011/10/30 09:42:40]

Done.

+  SetupTestSettingsBrowserOptions(browser()->profile(),
+                                  GURL("http://ynet.co.il"),
+                                  "\x79\x6E\x65\x74\x20\xD7\x97\xD7\x93\xD7\xA9\xD7\x95"
+                                  "\xD7\xAA\x20\xD7\xAA\xD7\x95\xD7\x9B\xD7\x9F\x20\xD7"
+                                  "\x95\xD7\xA2\xD7\x93\xD7\x9B\xD7\x95\xD7\xA0\xD7\x99"
+                                  "\xD7\x9D\x20\x2D\x20\xD7\x99\xD7\x93\xD7\x99\xD7\xA2"
+                                  "\xD7\x95\xD7\xAA\x20\xD7\x90\xD7\x97\xD7\xA8\xD7\x95"
+                                  "\xD7\xA0\xD7\x95\xD7\xAA");
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kBrowserOptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsBorwserOptionsPage) {
+  SetupTestSettingsBrowserOptions(browser()->profile(),
+                                  GURL("http://google.com"),
+                                  "Google");
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kBrowserOptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
 
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(url.c_str(), true);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsClearBrowserDataPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kClearBrowserDataSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsClearBrowserDataPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kClearBrowserDataSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsContentSettingsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kContentSettingsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsContentSettingsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kContentSettingsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsContentSettingsExceptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kContentSettingsExceptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsContentSettingsExceptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kContentSettingsExceptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsLanguageOptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kLanguageOptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsLanguageOptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kLanguageOptionsSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+                       TestSettingsSearchEnginesOptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kSearchEnginesSubPage);
+  RunBidiCheckerOnPage(url.c_str());
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+                       TestSettingsSearchEnginesOptionsPage) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kSearchEnginesSubPage);
+  RunBidiCheckerOnPage(url.c_str());
 }