From ef58460d8c1203f54f00cb28bb63090b4fe5ad28 Mon Sep 17 00:00:00 2001
From: jam <jam@chromium.org>
Date: Thu, 12 Feb 2015 10:32:28 -0800
Subject: [PATCH] Disable flaky DistilledPagePrefsTest, FontSizePrefsTest and
 AppMenuTest ChromeShellTests.

TBR=sunangel,aurimas
BUG=458193,458200,458196

Review URL: https://codereview.chromium.org/921553005

Cr-Commit-Position: refs/heads/master@{#316004}
---
 .../chrome/browser/accessibility/FontSizePrefsTest.java | 13 +++++++++++++
 .../chromium/chrome/browser/appmenu/AppMenuTest.java    |  5 +++++
 .../browser/dom_distiller/DistilledPagePrefsTest.java   | 17 +++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
index 08c7c2f805ba..4f22195cf5bd 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
@@ -10,6 +10,7 @@ import android.preference.PreferenceManager;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.content.browser.test.util.UiUtils;
@@ -66,8 +67,12 @@ public class FontSizePrefsTest extends ChromeShellTestBase {
         assertTrue(mFontSizePrefs.getUserSetForceEnableZoom());
     }
 
+    /*
     @SmallTest
     @Feature({"Accessibility"})
+    crbug.com/458200
+    */
+    @DisabledTest
     public void testObserversForceEnableZoom() throws InterruptedException {
         TestingObserver test1 = new TestingObserver();
         TestingObserver test2 = new TestingObserver();
@@ -89,8 +94,12 @@ public class FontSizePrefsTest extends ChromeShellTestBase {
         mFontSizePrefs.removeObserver(test2);
     }
 
+    /*
     @SmallTest
     @Feature({"Accessibility"})
+    crbug.com/458200
+    */
+    @DisabledTest
     public void testObserversFontScale() throws InterruptedException {
         TestingObserver test1 = new TestingObserver();
         TestingObserver test2 = new TestingObserver();
@@ -114,8 +123,12 @@ public class FontSizePrefsTest extends ChromeShellTestBase {
         mFontSizePrefs.removeObserver(test2);
     }
 
+    /*
     @SmallTest
     @Feature({"Accessibility"})
+    crbug.com/458200
+    */
+    @DisabledTest
     public void testObserversUserSetForceEnableZoom() throws InterruptedException {
         TestingObserver test1 = new TestingObserver();
         TestingObserver test2 = new TestingObserver();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
index 3cf7dfad5fb4..52616f8baba7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
@@ -14,6 +14,7 @@ import android.widget.ListPopupWindow;
 import android.widget.ListView;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellActivity.AppMenuHandlerFactory;
@@ -158,8 +159,12 @@ public class AppMenuTest extends ChromeShellTestBase {
     /**
      * Test that changing orientation hides the menu.
      */
+    /*
     @SmallTest
     @Feature({"Browser", "Main"})
+    crbug.com/458193
+    */
+    @DisabledTest
     public void testChangingOrientationHidesMenu() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         showAppMenuAndAssertMenuShown();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java
index d0f8fe308daf..bdc2f2aee175 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java
@@ -8,6 +8,7 @@ import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.shell.ChromeShellTestBase;
@@ -57,8 +58,12 @@ public class DistilledPagePrefsTest extends ChromeShellTestBase {
         assertEquals(Theme.SEPIA, mDistilledPagePrefs.getTheme());
     }
 
+    /*
     @SmallTest
     @Feature({"DomDistiller"})
+    crbug.com/458196
+    */
+    @DisabledTest
     public void testSingleObserverTheme() throws InterruptedException {
         TestingObserver testObserver = new TestingObserver();
         mDistilledPagePrefs.addObserver(testObserver);
@@ -72,8 +77,12 @@ public class DistilledPagePrefsTest extends ChromeShellTestBase {
         mDistilledPagePrefs.removeObserver(testObserver);
     }
 
+    /*
     @SmallTest
     @Feature({"DomDistiller"})
+    crbug.com/458196
+    */
+    @DisabledTest
     public void testMultipleObserversTheme() throws InterruptedException {
         TestingObserver testObserverOne = new TestingObserver();
         mDistilledPagePrefs.addObserver(testObserverOne);
@@ -105,8 +114,12 @@ public class DistilledPagePrefsTest extends ChromeShellTestBase {
         assertEquals(FontFamily.SERIF, mDistilledPagePrefs.getFontFamily());
     }
 
+    /*
     @SmallTest
     @Feature({"DomDistiller"})
+    crbug.com/458196
+    */
+    @DisabledTest
     public void testSingleObserverFontFamily() throws InterruptedException {
         TestingObserver testObserver = new TestingObserver();
         mDistilledPagePrefs.addObserver(testObserver);
@@ -120,8 +133,12 @@ public class DistilledPagePrefsTest extends ChromeShellTestBase {
         mDistilledPagePrefs.removeObserver(testObserver);
     }
 
+    /*
     @SmallTest
     @Feature({"DomDistiller"})
+    crbug.com/458196
+    */
+    @DisabledTest
     public void testMultipleObserversFontFamily() throws InterruptedException {
         TestingObserver testObserverOne = new TestingObserver();
         mDistilledPagePrefs.addObserver(testObserverOne);
-- 
2.11.4.GIT