summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornasko <nasko@chromium.org>2015-08-21 13:52:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-21 20:53:28 +0000
commite6ccdc3b6dc8270504c4579ef245617c4cdb456c (patch)
tree4b0756885ba8c645ce4253e4dfb50c29278c661a
parent8281c52db39e19b1e6678f31e70991512c9a4acc (diff)
downloadchromium_src-e6ccdc3b6dc8270504c4579ef245617c4cdb456c.zip
chromium_src-e6ccdc3b6dc8270504c4579ef245617c4cdb456c.tar.gz
chromium_src-e6ccdc3b6dc8270504c4579ef245617c4cdb456c.tar.bz2
Disable PluginsFieldTrialTest.NoPrefLeftBehind on iOS
The test is very flaky on iOS bots. TBR=bauerb@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=523462 Review URL: https://codereview.chromium.org/1308953002 Cr-Commit-Position: refs/heads/master@{#344856}
-rw-r--r--components/content_settings/core/browser/plugins_field_trial_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/components/content_settings/core/browser/plugins_field_trial_unittest.cc b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
index 2511f16..4607b397 100644
--- a/components/content_settings/core/browser/plugins_field_trial_unittest.cc
+++ b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
@@ -78,7 +78,13 @@ TEST_F(PluginsFieldTrialTest, SwitchOverridesFieldTrial2) {
EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
}
-TEST_F(PluginsFieldTrialTest, NoPrefLeftBehind) {
+// Disabled on iOS due to flakiness. https://crbug.com/523462
+#if defined(OS_IOS)
+#define MAYBE_NoPrefLeftBehind DISABLED_NoPrefLeftBehind
+#else
+#define MAYBE_NoPrefLeftBehind NoPrefLeftBehind
+#endif
+TEST_F(PluginsFieldTrialTest, MAYBE_NoPrefLeftBehind) {
ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kEnableFieldTrial, "Enabled"));
user_prefs::TestingPrefServiceSyncable prefs;
{