| Index: content/renderer/dom_serializer_browsertest.cc
|
| diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc
|
| index a16ee72095cbe9d7f362ed9da1b4cc94b43b16fa..3c3e549c12b6a4857c2b51ffe01707e306a00ac3 100644
|
| --- a/content/renderer/dom_serializer_browsertest.cc
|
| +++ b/content/renderer/dom_serializer_browsertest.cc
|
| @@ -640,15 +640,11 @@ class DomSerializerTests : public ContentBrowserTest,
|
|
|
| // If original contents have document type, the serialized contents also have
|
| // document type.
|
| -// Disabled by ellyjones@ on 2015-05-18, see https://crbug.com/488495.
|
| -#if defined(OS_MACOSX)
|
| -#define MAYBE_SerializeHTMLDOMWithDocType DISABLED_SerializeHTMLDOMWithDocType
|
| -#else
|
| -#define MAYBE_SerializeHTMLDOMWithDocType SerializeHTMLDOMWithDocType
|
| -#endif
|
| +// Disabled on OSX by ellyjones@ on 2015-05-18, see https://crbug.com/488495,
|
| +// on all platforms by tsergeant@ on 2016-03-10, see https://crbug.com/593575
|
|
|
| IN_PROC_BROWSER_TEST_F(DomSerializerTests,
|
| - MAYBE_SerializeHTMLDOMWithDocType) {
|
| + DISABLED_SerializeHTMLDOMWithDocType) {
|
| base::FilePath page_file_path =
|
| GetTestFilePath("dom_serializer", "youtube_1.htm");
|
| GURL file_url = net::FilePathToFileURL(page_file_path);
|
| @@ -725,16 +721,11 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithAddingMOTW) {
|
| // declaration as first child of HEAD element for resolving WebKit bug:
|
| // http://bugs.webkit.org/show_bug.cgi?id=16621 even the original document
|
| // does not have META charset declaration.
|
| -// Disabled by battre@ on 2015-05-21, see https://crbug.com/488495.
|
| -#if defined(OS_MACOSX)
|
| -#define MAYBE_SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc \
|
| - DISABLED_SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc
|
| -#else
|
| -#define MAYBE_SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc \
|
| - SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(DomSerializerTests,
|
| - MAYBE_SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
|
| +// Disabled on OSX by battre@ on 2015-05-21, see https://crbug.com/488495,
|
| +// on all platforms by tsergeant@ on 2016-03-10, see https://crbug.com/593575
|
| +IN_PROC_BROWSER_TEST_F(
|
| + DomSerializerTests,
|
| + DISABLED_SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
|
| base::FilePath page_file_path =
|
| GetTestFilePath("dom_serializer", "youtube_1.htm");
|
| // Get file URL.
|
|
|