Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: chrome/app/chrome_main_uitest.cc

Issue 9044013: Remove FAILS for Aura ChromeMainTest builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_uitest.cc
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index 23ffbccce15edafdd01b56f9367b580de6f8769b..755430550286143b267a2c77dd00acc9995beb03 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -14,29 +14,11 @@
typedef UITest ChromeMainTest;
#if !defined(OS_MACOSX)
-
-#if defined(USE_AURA)
-// http://crbug.com/104650
-#define MAYBE_SecondLaunch FAILS_SecondLaunch
-#define MAYBE_ReuseBrowserInstanceWhenOpeningFile \
- FAILS_ReuseBrowserInstanceWhenOpeningFile
-#define MAYBE_SecondLaunchWithIncognitoUrl FAILS_SecondLaunchWithIncognitoUrl
-#define MAYBE_SecondLaunchFromIncognitoWithNormalUrl \
- FAILS_SecondLaunchFromIncognitoWithNormalUrl
-#else
-#define MAYBE_SecondLaunch SecondLaunch
-#define MAYBE_ReuseBrowserInstanceWhenOpeningFile \
- ReuseBrowserInstanceWhenOpeningFile
-#define MAYBE_SecondLaunchWithIncognitoUrl SecondLaunchWithIncognitoUrl
-#define MAYBE_SecondLaunchFromIncognitoWithNormalUrl \
- SecondLaunchFromIncognitoWithNormalUrl
-#endif
-
// These tests don't apply to the Mac version; see
// LaunchAnotherBrowserBlockUntilClosed for details.
// Make sure that the second invocation creates a new window.
-TEST_F(ChromeMainTest, MAYBE_SecondLaunch) {
+TEST_F(ChromeMainTest, SecondLaunch) {
include_testing_id_ = false;
ASSERT_TRUE(LaunchAnotherBrowserBlockUntilClosed(
@@ -45,7 +27,7 @@ TEST_F(ChromeMainTest, MAYBE_SecondLaunch) {
ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
}
-TEST_F(ChromeMainTest, MAYBE_ReuseBrowserInstanceWhenOpeningFile) {
+TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
include_testing_id_ = false;
FilePath test_file = test_data_directory_.AppendASCII("empty.html");
@@ -57,7 +39,7 @@ TEST_F(ChromeMainTest, MAYBE_ReuseBrowserInstanceWhenOpeningFile) {
ASSERT_TRUE(automation()->IsURLDisplayed(net::FilePathToFileURL(test_file)));
}
-TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) {
+TEST_F(ChromeMainTest, SecondLaunchWithIncognitoUrl) {
include_testing_id_ = false;
int num_normal_windows;
// We should start with one normal window.
@@ -77,7 +59,7 @@ TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) {
ASSERT_EQ(1, num_normal_windows);
}
-TEST_F(ChromeMainTest, MAYBE_SecondLaunchFromIncognitoWithNormalUrl) {
+TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
include_testing_id_ = false;
int num_normal_windows;
// We should start with one normal window.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698