Enable browser encoding autodetection test

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 175 matching lines @@
 // ISO-8859-4
 // ISO-8859-13
 // KOI8-U
 // macintosh
 // windows-874
 // windows-1252
 // windows-1253
 // windows-1257
 // windows-1258
 
-// For Hebrew, the expected encoding value is ISO-8859-8-I. See
-// http://crbug.com/2927 for more details.
-//
-// This test is failing consistently on ChromeOS, see http://crbug.com/512996.
-#if defined(OS_CHROMEOS)
-#define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect
-#else
-#define MAYBE_TestEncodingAutoDetect TestEncodingAutoDetect
-#endif
-// TODO(phajdan.jr): See if fix for http://crbug.com/122053 would help here.
-// Disabled to revert a depending Blink CL. crbug.com/328354, and
-// crbug.com/510422.
-IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestEncodingAutoDetect) {
+IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestEncodingAutoDetect) {
   struct EncodingAutoDetectTestData {
     const char* test_file_name;   // File name of test data.
     const char* expected_result;  // File name of expected results.
     const char* expected_encoding;   // expected encoding.
   };
   const EncodingAutoDetectTestData kTestDatas[] = {
       { "Big5_with_no_encoding_specified.html",
         "expected_Big5_saved_from_no_encoding_specified.html",
         "Big5" },
-      { "gb18030_with_no_encoding_specified.html",
-        "expected_gb18030_saved_from_no_encoding_specified.html",
-        "gb18030" },
+      { "GBK_with_no_encoding_specified.html",
+        "expected_GBK_saved_from_no_encoding_specified.html",
+        "GBK" },
       { "iso-8859-1_with_no_encoding_specified.html",
         "expected_iso-8859-1_saved_from_no_encoding_specified.html",
         "windows-1252" },
       { "ISO-8859-5_with_no_encoding_specified.html",
         "expected_ISO-8859-5_saved_from_no_encoding_specified.html",
         "ISO-8859-5" },
       { "ISO-8859-6_with_no_encoding_specified.html",
         "expected_ISO-8859-6_saved_from_no_encoding_specified.html",
         "ISO-8859-6" },
       { "ISO-8859-7_with_no_encoding_specified.html",
         "expected_ISO-8859-7_saved_from_no_encoding_specified.html",
         "ISO-8859-7" },
-      { "ISO-8859-8_with_no_encoding_specified.html",
-        "expected_ISO-8859-8_saved_from_no_encoding_specified.html",
-        "ISO-8859-8-I" },
+      { "ISO-8859-8-I_with_no_encoding_specified.html",
+        "expected_ISO-8859-8-I_saved_from_no_encoding_specified.html",
+        "windows-1255" },
       { "KOI8-R_with_no_encoding_specified.html",
         "expected_KOI8-R_saved_from_no_encoding_specified.html",
         "KOI8-R" },
       { "Shift-JIS_with_no_encoding_specified.html",
         "expected_Shift-JIS_saved_from_no_encoding_specified.html",
         "Shift_JIS" },
       { "UTF-8_with_no_encoding_specified.html",
         "expected_UTF-8_saved_from_no_encoding_specified.html",
         "UTF-8" },
       { "EUC-KR_with_no_encoding_specified.html",
@@ skipping 43 matching lines @@
 
     // Dump the page, the content of dump page should be equal with our expect
     // result file.
     base::FilePath expected_result_file_name =
         base::FilePath().AppendASCII(kAutoDetectDir).
         AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }