Marking two OptionsUITests (TwoCommandsOneTab & CommandAgainGoesBackToOptionsTab) as DISALBED because of linux/views crashes

TBR=csilv
BUG=48521
TEST=

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

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

1 files changed, 18 insertions, 3 deletions

diff --git a/chrome/browser/dom_ui/options/options_ui_uitest.cc b/chrome/browser/dom_ui/options/options_ui_uitest.cc
index 42d00a3..f534f33 100644
--- a/chrome/browser/dom_ui/options/options_ui_uitest.cc
+++ b/chrome/browser/dom_ui/options/options_ui_uitest.cc
@@ -66,7 +66,16 @@ TEST_F(OptionsUITest, CommandOpensOptionsTab) {
 }
 
 // TODO(csilv): Investigate why this fails and fix. http://crbug.com/48521
-TEST_F(OptionsUITest, FLAKY_CommandAgainGoesBackToOptionsTab) {
+// Also, crashing on linux/views.
+#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#define MAYBE_CommandAgainGoesBackToOptionsTab \
+    DISABLED_CommandAgainGoesBackToOptionsTab
+#else
+#define MAYBE_CommandAgainGoesBackToOptionsTab \
+    FLAKY_CommandAgainGoesBackToOptionsTab
+#endif
+
+TEST_F(OptionsUITest, MAYBE_CommandAgainGoesBackToOptionsTab) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
@@ -95,8 +104,14 @@ TEST_F(OptionsUITest, FLAKY_CommandAgainGoesBackToOptionsTab) {
 }
 
 // TODO(csilv): Investigate why this fails (sometimes) on 10.5 and fix.
-// http://crbug.com/48521
-TEST_F(OptionsUITest, FLAKY_TwoCommandsOneTab) {
+// http://crbug.com/48521. Also, crashing on linux/views.
+#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#define MAYBE_TwoCommandsOneTab DISABLED_TwoCommandsOneTab
+#else
+#define MAYBE_TwoComamndsOneTab FLAKY_TwoCommandsOneTab
+#endif
+
+TEST_F(OptionsUITest, MAYBE_TwoCommandsOneTab) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());