Revert 110861 - Adding more bidichecker tests and doing some minor cleanups.

These tests are constantly failing on Linux ChromeOS bot (chromium.chromiumos waterfall): TestBugReportPage, TestSettingsLanguageOptionsPage.

BUG=NONE
TEST=NONE

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

TBR=jeremy@chromium.org
Review URL: http://codereview.chromium.org/8606009

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

chrome/browser/ui/webui/bidi_checker_web_ui_test.h

@@ -15,29 +15,27 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
  public:
   virtual ~WebUIBidiCheckerBrowserTest();
 
- protected:
-  WebUIBidiCheckerBrowserTest();
-
   // Runs the Bidi Checker on the given page URL. |isRTL| should be true when
   // the active page locale is RTL.
   void RunBidiCheckerOnPage(const char pageURL[], bool isRTL);
 
+ protected:
+  WebUIBidiCheckerBrowserTest();
+
   // Setup test path.
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
 };
 
-// Base class for BidiChecker-based tests that run with an LTR UI.
-class WebUIBidiCheckerBrowserTestLTR : public WebUIBidiCheckerBrowserTest {
- public:
-  void RunBidiCheckerOnPage(const char pageURL[]);
-};
-
 // Base class for BidiChecker-based tests that run with an RTL UI.
-class WebUIBidiCheckerBrowserTestRTL : public WebUIBidiCheckerBrowserTest {
+// Preloads the BidiChecker JS library for each test, as well as modifies the
+// active language.
+class WebUIBidiCheckerBrowserTestFakeBidi : public WebUIBidiCheckerBrowserTest {
  public:
-  void RunBidiCheckerOnPage(const char pageURL[]);
+  virtual ~WebUIBidiCheckerBrowserTestFakeBidi();
 
  protected:
+  WebUIBidiCheckerBrowserTestFakeBidi();
+
   virtual void SetUpOnMainThread() OVERRIDE;
   virtual void CleanUpOnMainThread() OVERRIDE;
 

chrome/test/data/webui/bidichecker_tests.js

@@ -20,12 +20,12 @@ function filtersForPage(pageName, isRTL) {
     "chrome://history" : {
       // Filters for LTR UI
       "LTR" : [
-        // BUG: http://crbug.com/80791
+        // BUG: http://code.google.com/p/chromium/issues/detail?id=80791
         bidichecker.FilterFactory.atText("בדיקה")
       ],
       // Filters for RTL UI
       "RTL" : [
-        // BUG: http://crbug.com/80791
+        // BUG: http://code.google.com/p/chromium/issues/detail?id=80791
         bidichecker.FilterFactory.atText("Google"),
         bidichecker.FilterFactory.atText("www.google.com"),
         // The following two are probably false positives since we can't
@@ -37,11 +37,11 @@ function filtersForPage(pageName, isRTL) {
     },
     "chrome://settings/autofill" : {
       "LTR" : [
-        // BUG: http://crbug.com/82267
+        // BUG: http://code.google.com/p/chromium/issues/detail?id=82267
         bidichecker.FilterFactory.atText("משה ב כהן, דרך מנחם בגין")
       ],
       "RTL" : [
-        // BUG: http://crbug.com/90322
+        // BUG: http://code.google.com/p/chromium/issues/detail?id=90322
         bidichecker.FilterFactory.atText(
             "Milton C. Waddams, 4120 Freidrich Lane")
       ]
@@ -57,55 +57,10 @@ function filtersForPage(pageName, isRTL) {
     },
     "chrome://newtab" : {
       "RTL" : [
-        // BUG: http://crbug.com/93339
+        // BUG: http://code.google.com/p/chromium/issues/detail?id=93339
         bidichecker.FilterFactory.atText("Chrome Web Store"),
         bidichecker.FilterFactory.atText("File Manager")
       ]
-    },
-    "chrome://bugreport#0?description=%D7%91%D7%93%D7%99%D7%A7%D7%94&issueType=1" : {
-      "LTR" : [
-        // BUG: http://crbug.com/90835
-        bidichecker.FilterFactory.atText("בדיקה")
-      ]
-    },
-    "chrome://bugreport#0?description=test&issueType=1" : {
-      "RTL" : [
-        // BUG: http://crbug.com/90835
-        bidichecker.FilterFactory.atText("test")
-      ]
-    },
-    "chrome://settings/browser" : {
-      "LTR" : [
-        // BUG: http://crbug.com/93702
-        bidichecker.FilterFactory.atText("חדשות תוכן ועדכונים - ידיעות אחרונות")
-      ]
-    },
-    "chrome://settings/clearBrowserData" : {
-      "RTL" : [
-        // BUG: http://crbug.com/94070
-        bidichecker.FilterFactory.atText("Google Cloud Print")
-      ]
-    },
-    "chrome://settings/content" : {
-      "RTL" : [
-        // BUG: http://crbug.com/94070
-        bidichecker.FilterFactory.atText("Google Cloud Print")
-      ]
-    },
-    "chrome://settings/languages" : {
-      "RTL" : [
-        // BUG: http://crbug.com/94070
-        bidichecker.FilterFactory.atText("Google Cloud Print"),
-        bidichecker.FilterFactory.atText("Hebrew"),
-        bidichecker.FilterFactory.atText("English (United States"),
-        bidichecker.FilterFactory.atText("English")
-      ]
-    },
-    "chrome://settings/contentExceptions" : {
-      "RTL" : [
-        // BUG: http://crbug.com/94070
-        bidichecker.FilterFactory.atText("Google Cloud Print")
-      ]
     }
   };