Re-enable BrowserEncodingTest.TestEncodingAliasMapping under ASan

chrome/browser/browser_encoding_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 58 matching lines @@
   FilePath save_dir_;
   FilePath temp_sub_resource_dir_;
 };
 
 // TODO(jnd): 1. Some encodings are missing here. It'll be added later. See
 // http://crbug.com/13306.
 // 2. Add more files with multiple encoding name variants for each canonical
 // 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;
   };
 
   const EncodingTestData kEncodingTestDatas[] = {
     { "Big5.html", "Big5" },
     { "EUC-JP.html", "EUC-JP" },
     { "gb18030.html", "gb18030" },
     { "iso-8859-1.html", "ISO-8859-1" },
@@ skipping 192 matching lines @@
     EXPECT_EQ(kTestDatas[i].expected_encoding, web_contents->GetEncoding());
 
     // Dump the page, the content of dump page should be equal with our expect
     // result file.
     FilePath expected_result_file_name =
         FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }