Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: chrome/browser/browser_encoding_browsertest.cc

Issue 10834309: Re-enable BrowserEncodingTest.TestEncodingAliasMapping under ASan (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_encoding_browsertest.cc
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index 52ddfe3188aa7c3ef6ba0056ff5e445d33e18e2d..941d6674ab5a8275898c6baf1832ecde166000d7 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -76,14 +76,7 @@ class BrowserEncodingTest : public InProcessBrowserTest {
// encoding name). Webkit layout tests cover some, but testing in the UI test is
// also necessary.
// SLOW_ is added for XP debug bots. These tests should really be unittests...
-//
-// The tests times out under ASan, see http://crbug.com/127748.
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_TestEncodingAliasMapping DISABLED_TestEncodingAliasMapping
-#else
-#define MAYBE_TestEncodingAliasMapping SLOW_TestEncodingAliasMapping
-#endif
-IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAliasMapping) {
+IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, SLOW_TestEncodingAliasMapping) {
struct EncodingTestData {
const char* file_name;
const char* encoding_name;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698