Index: chrome/browser/prefs/tracked/pref_hash_browsertest.cc |
diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc |
index 6cf4a89d3fa98a2ab9b34409ddd82bc80b69e8c7..3236587fdca97105ea3da821acc6ae178a579eda 100644 |
--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc |
+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc |
@@ -519,9 +519,7 @@ class PrefHashBrowserTestUnchangedDefault : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
jam
2017/05/17 19:06:16
https://codereview.chromium.org/2882423002 was als
gab
2017/05/17 20:01:04
Done.
|
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedDefault, |
- DISABLED_UnchangedDefault); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedDefault, UnchangedDefault); |
// Augments PrefHashBrowserTestUnchangedDefault to confirm that nothing is reset |
// when nothing is tampered with, even if Chrome itself wrote custom prefs in |
@@ -548,9 +546,7 @@ class PrefHashBrowserTestUnchangedCustom |
} |
}; |
-// Test is flaky. crbug.com/723639 |
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedCustom, |
- DISABLED_UnchangedCustom); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedCustom, UnchangedCustom); |
// Verifies that cleared prefs are reported. |
class PrefHashBrowserTestClearedAtomic : public PrefHashBrowserTestBase { |
@@ -622,9 +618,7 @@ class PrefHashBrowserTestClearedAtomic : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestClearedAtomic, |
- DISABLED_ClearedAtomic); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestClearedAtomic, ClearedAtomic); |
// Verifies that clearing the MACs results in untrusted Initialized pings for |
// non-null protected prefs. |
@@ -758,9 +752,8 @@ class PrefHashBrowserTestUntrustedInitialized : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedInitialized, |
- DISABLED_UntrustedInitialized); |
+ UntrustedInitialized); |
// Verifies that changing an atomic pref results in it being reported (and reset |
// if the protection level allows it). |
@@ -858,9 +851,7 @@ class PrefHashBrowserTestChangedAtomic : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedAtomic, |
- DISABLED_ChangedAtomic); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedAtomic, ChangedAtomic); |
// Verifies that changing or adding an entry in a split pref results in both |
// items being reported (and remove if the protection level allows it). |
@@ -967,9 +958,7 @@ class PrefHashBrowserTestChangedSplitPref : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedSplitPref, |
- DISABLED_ChangedSplitPref); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedSplitPref, ChangedSplitPref); |
// Verifies that adding a value to unprotected preferences for a key which is |
// still using the default (i.e. has no value stored in protected preferences) |
@@ -1053,9 +1042,8 @@ class PrefHashBrowserTestUntrustedAdditionToPrefs |
} |
}; |
-// Test is flaky. crbug.com/723639 |
PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefs, |
- DISABLED_UntrustedAdditionToPrefs); |
+ UntrustedAdditionToPrefs); |
// Verifies that adding a value to unprotected preferences while wiping a |
// user-selected value from protected preferences doesn't allow that value to |
@@ -1141,9 +1129,8 @@ class PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe |
} |
}; |
-// Test is flaky. crbug.com/723639 |
PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe, |
- DISABLED_UntrustedAdditionToPrefsAfterWipe); |
+ UntrustedAdditionToPrefsAfterWipe); |
#if defined(OS_WIN) |
class PrefHashBrowserTestRegistryValidationFailure |
@@ -1186,9 +1173,8 @@ class PrefHashBrowserTestRegistryValidationFailure |
} |
}; |
-// Test is flaky. crbug.com/723639 |
PREF_HASH_BROWSER_TEST(PrefHashBrowserTestRegistryValidationFailure, |
- DISABLED_RegistryValidationFailure); |
+ RegistryValidationFailure); |
#endif |
// Verifies that all preferences related to choice of default search engine are |
@@ -1293,6 +1279,4 @@ class PrefHashBrowserTestDefaultSearch : public PrefHashBrowserTestBase { |
} |
}; |
-// Test is flaky. crbug.com/723639 |
-PREF_HASH_BROWSER_TEST(PrefHashBrowserTestDefaultSearch, |
- DISABLED_SearchProtected); |
+PREF_HASH_BROWSER_TEST(PrefHashBrowserTestDefaultSearch, SearchProtected); |