summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 17:00:47 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 17:00:47 +0000
commit2503a9c5d762887c3a4038f13f5aa6b3e1d965fb (patch)
tree7acf5010e6874d7cbcb740d0ad941cd92456af56
parent8f4c5af24716869d58e4543eb8803c58b54f8389 (diff)
downloadchromium_src-2503a9c5d762887c3a4038f13f5aa6b3e1d965fb.zip
chromium_src-2503a9c5d762887c3a4038f13f5aa6b3e1d965fb.tar.gz
chromium_src-2503a9c5d762887c3a4038f13f5aa6b3e1d965fb.tar.bz2
TBR: joth@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56211 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/save_page_browsertest.cc2
-rw-r--r--webkit/glue/dom_serializer_unittest.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 22c9db8..52a45d6 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -107,6 +107,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveViewSourceHTMLOnly) {
full_file_name));
}
+// See http://crbug.com/52292
IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FLAKY_SaveCompleteHTML) {
FilePath file_name(FILE_PATH_LITERAL("b.htm"));
GURL url = URLRequestMockHTTPJob::GetMockUrl(
@@ -145,6 +146,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) {
EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_SAVE_PAGE));
}
+// See http://crbug.com/52292
IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FLAKY_FileNameFromPageTitle) {
FilePath file_name(FILE_PATH_LITERAL("b.htm"));
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 40f1cba..ddc3874 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -584,7 +584,7 @@ TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) {
// Test situation of html entities in attribute value when serializing
// HTML DOM.
// This test started to fail at WebKit r65388. See http://crbug.com/52279.
-TEST_F(DomSerializerTests, FAILS_SerializeHTMLDOMWithEntitiesInAttributeValue) {
+TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII(
"dom_serializer/htmlentities_in_attribute_value.htm");
@@ -634,7 +634,7 @@ TEST_F(DomSerializerTests, FAILS_SerializeHTMLDOMWithEntitiesInAttributeValue) {
// Test situation of non-standard HTML entities when serializing HTML DOM.
// This test started to fail at WebKit r65351. See http://crbug.com/52279.
-TEST_F(DomSerializerTests, FAILS_SerializeHTMLDOMWithNonStandardEntities) {
+TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithNonStandardEntities) {
// Make a test file URL and load it.
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");