Revert of Enable and fix tests after page serializer merge

Revert of Enable and fix tests after page serializer merge (patchset #1 id:1 of https://codereview.chromium.org/1219923010/ )

Reason for revert:
Needs to revert Blink 198503, which this depends on.


Original issue's description:
> Enable and fix tests after page serializer merge
> 
> Enable and fix two SavePageBrowserTests and two BrowserEncodingTest that
> where removed in <https://codereview.chromium.org/1218743006/>; in
> preparation of the page serializer merger in
> <https://codereview.chromium.org/1177733003/>;.
> 
> Patch from gustav.tiger@sonymobile.com
> 
> R=jochen@chromium.org, rdsmith@chromium.org
> BUG=328354
> 
> Committed: https://chromium.googlesource.com/chromium/src/+/bbf281076da0c593ec9d586eb78b2498581d070e

TBR=jochen@chromium.org,rdsmith@chromium.org,gustav.tiger@sonymobile.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=328354, 510422
Committed: https://chromium.googlesource.com/chromium/src/+/1ee1e16e9853ca88730ec2345933a3d07ec20c04

[tkent, 2015-08-17 03:13:23]

Created Revert of Enable and fix tests after page serializer merge

[commit-bot: I haz the power, 2015-08-17 03:13:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1301503003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1301503003/1

[commit-bot: I haz the power, 2015-08-17 03:13:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-17 03:13:42]

Failed to apply patch for chrome/browser/browser_encoding_browsertest.cc:
While running git apply --index -3 -p1;
  error: patch failed: chrome/browser/browser_encoding_browsertest.cc:230
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/browser_encoding_browsertest.cc' with
conflicts.
  U chrome/browser/browser_encoding_browsertest.cc

Patch:       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
b4a593a5630a7a1933c5f33f59e1574eb0b72c82..949c3687828de933ff94aa286fb707955548baed
100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -178,7 +178,7 @@
                         testing::ValuesIn(kEncodingTestDatas));
 
 // Marked as flaky: see  http://crbug.com/44668
-IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
+IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_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 @@
 #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, TestEncodingAutoDetect) {
+IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestEncodingAutoDetect) {
   struct EncodingAutoDetectTestData {
     const char* test_file_name;   // File name of test data.
     const char* expected_result;  // File name of expected results.

[commit-bot: I haz the power, 2015-08-17 03:13:43]

The CQ bit was unchecked by commit-bot@chromium.org

[tkent, 2015-08-17 03:20:27]

The CQ bit was checked by tkent@chromium.org

[commit-bot: I haz the power, 2015-08-17 03:20:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1301503003/200001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1301503003/200001

[commit-bot: I haz the power, 2015-08-17 03:20:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-17 03:20:49]

Failed to apply patch for
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:17
  Falling back to three-way merge...
  error: patch failed:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:17
  error:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html:
patch does not apply

Patch:      
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
Index:
chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
diff --git
a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
index
0d530cd5fe860a3e0fbeaa4430cd4f488cb00620..4e2107db46dd2259eef504f32a811e7b7aee0cc0
100644
---
a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
+++
b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
@@ -17,5 +17,4 @@

Íò½Ý£¬ÑŲýÆóÒµ¼¯ÍÅÓÐÏÞ¹«Ë¾¶­Ê³¤£¬Ëû´´ÔìÐÔ½«´«Í³Ó¡Ë¢ÒµÓëÏÖ´úIT¼¼ÊõÍêÃÀÈںϣ¬ÔÚ±ÏÉý·¢Ã÷Ó¡Ë¢Êõ900¶àÄêºó£¬ËûΪӡˢÊõµÄ¹ÊÏçÖØÐÂÓ®µÃÁ˽¾°ÁºÍ×ðÑÏ£»
 

º«Èýƽ£¬ÖйúµçÓ°¼¯ÍŹ«Ë¾¶­Ê³¤£¬´Ó¡¶ÎÞ¼«¡·¡¢¡¶Í¶Ãû×´¡·µ½¡¶³à±Ú¡·¡¢¡¶Ã·À¼·¼¡·£¬Óɺ«ÈýƽÁìµ¼µÄÖÐÓ°ÍŶÓʹÖйúµçÓ°¿ªÊ¼½øÈë³ÉÊìµÄ´óƬʱ´ú£»
-
 </body></html>
\ No newline at end of file

[commit-bot: I haz the power, 2015-08-17 03:20:51]

The CQ bit was unchecked by commit-bot@chromium.org

[tkent, 2015-08-17 03:29:52]

Committed patchset #2 (id:200001) manually as
1ee1e16e9853ca88730ec2345933a3d07ec20c04 (presubmit successful).