Re-enable BrowserEncodingTest.TestEncodingAliasMapping under ASan

BUG=127748
TEST=manual and on bot


Review URL: https://chromiumcodereview.appspot.com/10834309

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

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;