Revert 110861 - 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
===================================================================
--- chrome/browser/ui/webui/bidi_checker_web_ui_test.cc	(revision 110898)
+++ chrome/browser/ui/webui/bidi_checker_web_ui_test.cc	(working copy)
@@ -14,8 +14,6 @@
 #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"
@@ -59,17 +57,13 @@
                                 Value::CreateBooleanValue(isRTL)));
 }
 
-void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage(
-    const char pageURL[]) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, false);
-}
+// WebUIBidiCheckerBrowserTestFakeBidi
 
-void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
-    const char pageURL[]) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, true);
-}
+WebUIBidiCheckerBrowserTestFakeBidi::~WebUIBidiCheckerBrowserTestFakeBidi() {}
 
-void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
+WebUIBidiCheckerBrowserTestFakeBidi::WebUIBidiCheckerBrowserTestFakeBidi() {}
+
+void WebUIBidiCheckerBrowserTestFakeBidi::SetUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
   FilePath pak_path;
   app_locale_ = base::i18n::GetConfiguredLocale();
@@ -86,7 +80,7 @@
 #endif
 }
 
-void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() {
+void WebUIBidiCheckerBrowserTestFakeBidi::CleanUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::CleanUpOnMainThread();
 #if defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)
   gtk_widget_set_default_direction(GTK_TEXT_DIR_LTR);
@@ -98,196 +92,143 @@
 
 // Tests
 
-//==============================
-// chrome://history
-//==============================
-
-static void SetupHistoryPageTest(Browser* browser,
-                                 const std::string page_url,
-                                 const std::string page_title) {
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestMainHistoryPageLTR) {
   HistoryService* history_service =
-      browser->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
-  const GURL history_url = GURL(page_url);
+      browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
+  GURL history_url = GURL("http://www.ynet.co.il");
   history_service->AddPage(history_url, history::SOURCE_BROWSED);
-  history_service->SetPageTitle(history_url, UTF8ToUTF16(page_title));
+  string16 title;
+  ASSERT_TRUE(UTF8ToUTF16("\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x21",
+                          12,
+                          &title));
+  history_service->SetPageTitle(history_url, title);
+  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL, false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryPage) {
-  // Test an Israeli news site with a Hebrew title.
-  SetupHistoryPageTest(browser(),
-                       "http://www.ynet.co.il",
-                       "\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x21");
-  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestMainHistoryPageRTL) {
+  HistoryService* history_service =
+      browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
+  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);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryPage) {
-  SetupHistoryPageTest(browser(), "http://www.google.com", "Google");
-  RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestAboutPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUIAboutURL, false);
 }
 
-//==============================
-// chrome://about
-//==============================
-
-// This page isn't localized to an RTL language so we test it only in English.
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestAboutPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUIAboutURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestBugReportPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUIBugReportURL, false);
 }
 
-//==============================
-// chrome://bugreport
-//==============================
-
-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");
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestCrashesPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL, false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
-                       TestBugReportPage) {
-  RunBidiCheckerOnPage("chrome://bugreport#0?description=test&issueType=1");
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestCrashesPageRTL) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUICrashesURL,
+                                                    true);
 }
 
-//==============================
-// chrome://crashes
-//==============================
-
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestCrashesPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL);
-}
-
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestCrashesPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUICrashesURL);
-}
-
-//==============================
-// chrome://downloads
-//==============================
-
 #if defined(OS_WIN) || defined(OS_LINUX)
 // http://crbug.com/104129
-#define TestDownloadsPageLTR FLAKY_TestDownloadsPage
+#define TestDownloadsPageLTR FLAKY_TestDownloadsPageLTR
 #endif
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestDownloadsPageLTR) {
-  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestDownloadsPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL, false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestDownloadsPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestDownloadsPageRTL) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
+      chrome::kChromeUIDownloadsURL, true);
 }
 
-//==============================
-// chrome://newtab
-//==============================
-
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestNewTabPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestNewTabPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL, false);
 }
 
 // http://crbug.com/97453
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
-                       DISABLED_TestNewTabPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUINewTabURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       DISABLED_TestNewTabPageRTL) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUINewTabURL,
+                                                    true);
 }
 
-//==============================
-// chrome://plugins
-//==============================
-
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestPluginsPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestPluginsPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL, false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestPluginsPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestPluginsPageRTL) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL,
+                                                    true);
 }
 
-//==============================
-// chrome://settings
-//==============================
-
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestSettingsPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestSettingsPageLTR) {
+  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL, false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestSettingsPage) {
-  RunBidiCheckerOnPage(chrome::kChromeUISettingsURL);
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestSettingsPageRTL) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
+      chrome::kChromeUISettingsURL, true);
 }
 
 #if defined(OS_MACOSX)
 // http://crbug.com/94642
-#define MAYBE_TestSettingsAutofillPage FLAKY_TestSettingsAutofillPage
+#define MAYBE_TestSettingsAutofillPageLTR FLAKY_TestSettingsAutofillPageLTR
 #elif defined(OS_WIN)
 // http://crbug.com/95425
-#define MAYBE_TestSettingsAutofillPage FAILS_TestSettingsAutofillPage
+#define MAYBE_TestSettingsAutofillPageLTR FAILS_TestSettingsAutofillPageLTR
 #else
-#define MAYBE_TestSettingsAutofillPage TestSettingsAutofillPage
+#define MAYBE_TestSettingsAutofillPageLTR TestSettingsAutofillPageLTR
 #endif  // defined(OS_MACOSX)
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest,
+                       MAYBE_TestSettingsAutofillPageLTR) {
+  std::string url(chrome::kChromeUISettingsURL);
+  url += std::string(chrome::kAutofillSubPage);
 
-static void SetupSettingsAutofillPageTest(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);
+  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");
+
   PersonalDataManager* personal_data_manager =
-      PersonalDataManagerFactory::GetForProfile(profile);
+    PersonalDataManagerFactory::GetForProfile(browser()->profile());
   ASSERT_TRUE(personal_data_manager);
-  personal_data_manager->AddProfile(autofill_profile);
+
+  personal_data_manager->AddProfile(profile);
+
+  RunBidiCheckerOnPage(url.c_str(), false);
 }
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
-                       TestSettingsAutofillPage) {
-  SetupSettingsAutofillPageTest(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",
-                                "\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");
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
+                       TestSettingsAutofillPageRTL) {
   std::string url(chrome::kChromeUISettingsURL);
   url += std::string(chrome::kAutofillSubPage);
-  RunBidiCheckerOnPage(url.c_str());
-}
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
-                       TestSettingsAutofillPage) {
-  SetupSettingsAutofillPageTest(browser()->profile(),
+  autofill_test::DisableSystemServices(browser()->profile());
+  AutofillProfile profile;
+  autofill_test::SetProfileInfo(
+                                &profile,
                                 "Milton",
                                 "C.",
                                 "Waddams",
@@ -300,120 +241,12 @@
                                 "78744",
                                 "United States",
                                 "5125551234");
-  std::string url(chrome::kChromeUISettingsURL);
-  url += std::string(chrome::kAutofillSubPage);
-  RunBidiCheckerOnPage(url.c_str());
-}
 
-static void SetupSettingsBrowserOptionsTest(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);
-}
+  PersonalDataManager* personal_data_manager =
+      PersonalDataManagerFactory::GetForProfile(browser()->profile());
+  ASSERT_TRUE(personal_data_manager);
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
-                       TestSettingsBrowserOptionsPage) {
-  SetupSettingsBrowserOptionsTest(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());
-}
+  personal_data_manager->AddProfile(profile);
 
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
-                       TestSettingsBrowserOptionsPage) {
-  SetupSettingsBrowserOptionsTest(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());
-}