| Index: chrome/app/chrome_main_uitest.cc
|
| diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
|
| index 755430550286143b267a2c77dd00acc9995beb03..23ffbccce15edafdd01b56f9367b580de6f8769b 100644
|
| --- a/chrome/app/chrome_main_uitest.cc
|
| +++ b/chrome/app/chrome_main_uitest.cc
|
| @@ -14,11 +14,29 @@
|
| 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, SecondLaunch) {
|
| +TEST_F(ChromeMainTest, MAYBE_SecondLaunch) {
|
| include_testing_id_ = false;
|
|
|
| ASSERT_TRUE(LaunchAnotherBrowserBlockUntilClosed(
|
| @@ -27,7 +45,7 @@ TEST_F(ChromeMainTest, SecondLaunch) {
|
| ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
|
| }
|
|
|
| -TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
|
| +TEST_F(ChromeMainTest, MAYBE_ReuseBrowserInstanceWhenOpeningFile) {
|
| include_testing_id_ = false;
|
|
|
| FilePath test_file = test_data_directory_.AppendASCII("empty.html");
|
| @@ -39,7 +57,7 @@ TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
|
| ASSERT_TRUE(automation()->IsURLDisplayed(net::FilePathToFileURL(test_file)));
|
| }
|
|
|
| -TEST_F(ChromeMainTest, SecondLaunchWithIncognitoUrl) {
|
| +TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) {
|
| include_testing_id_ = false;
|
| int num_normal_windows;
|
| // We should start with one normal window.
|
| @@ -59,7 +77,7 @@ TEST_F(ChromeMainTest, SecondLaunchWithIncognitoUrl) {
|
| ASSERT_EQ(1, num_normal_windows);
|
| }
|
|
|
| -TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
|
| +TEST_F(ChromeMainTest, MAYBE_SecondLaunchFromIncognitoWithNormalUrl) {
|
| include_testing_id_ = false;
|
| int num_normal_windows;
|
| // We should start with one normal window.
|
|
|