Enable and fix tests after page serializer merge

chrome/browser/browser_encoding_browsertest.cc

Index: chrome/browser/browser_encoding_browsertest.cc
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index 949c3687828de933ff94aa286fb707955548baed..b4a593a5630a7a1933c5f33f59e1574eb0b72c82 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -178,7 +178,7 @@ INSTANTIATE_TEST_CASE_P(EncodingAliases,
                         testing::ValuesIn(kEncodingTestDatas));
 
 // Marked as flaky: see  http://crbug.com/44668
-IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) {
+IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
   const char* const kTestFileName = "gb18030_with_iso88591_meta.html";
   const char* const kExpectedFileName =
       "expected_gb18030_saved_from_iso88591_meta.html";
@@ -230,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) {
 #define MAYBE_TestEncodingAutoDetect TestEncodingAutoDetect
 #endif
 // TODO(phajdan.jr): See if fix for http://crbug.com/122053 would help here.
-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.