chrome/browser/download/save_page_browsertest.cc - Issue 11818065: OK, here's john's patch plus my sync stuff.

Unified Diff: chrome/browser/download/save_page_browsertest.cc

Issue 11818065: OK, here's john's patch plus my sync stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Redisable PlatformAppBrowserTest.WebContentsHasFocus on aura Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/autofill/form_structure_browsertest.cc ('k') | chrome/browser/extensions/api/app_window/app_window_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/save_page_browsertest.cc

diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc

index f011a1282c20d23f601cc06cff4ee1de5284f63e..8070b1d0a28444aad25c18a972828a0c762d224a 100644

--- a/chrome/browser/download/save_page_browsertest.cc

+++ b/chrome/browser/download/save_page_browsertest.cc

@@ -377,7 +377,8 @@ SavePageBrowserTest::~SavePageBrowserTest() {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_SaveHTMLOnly DISABLED_SaveHTMLOnly

#else

#define MAYBE_SaveHTMLOnly SaveHTMLOnly

@@ -408,7 +409,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveHTMLOnly) {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_SaveHTMLOnlyCancel DISABLED_SaveHTMLOnlyCancel

#else

#define MAYBE_SaveHTMLOnlyCancel SaveHTMLOnlyCancel

@@ -473,7 +475,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnlyTabDestroy) {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_SaveViewSourceHTMLOnly DISABLED_SaveViewSourceHTMLOnly

#else

#define MAYBE_SaveViewSourceHTMLOnly SaveViewSourceHTMLOnly

@@ -512,7 +515,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveViewSourceHTMLOnly) {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_SaveCompleteHTML DISABLED_SaveCompleteHTML

#else

#define MAYBE_SaveCompleteHTML SaveCompleteHTML

@@ -606,7 +610,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_FileNameFromPageTitle DISABLED_FileNameFromPageTitle

#else

#define MAYBE_FileNameFromPageTitle FileNameFromPageTitle

@@ -649,7 +654,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_FileNameFromPageTitle) {

}

// Disabled on Windows due to flakiness. http://crbug.com/162323

-#if defined(OS_WIN)

+// TODO(linux_aura) http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_RemoveFromList DISABLED_RemoveFromList

#else

#define MAYBE_RemoveFromList RemoveFromList