Marks ChromeMainTests as FAILS on aura.

R=stevenjb@chromium.org
BUG=104650
TEST=none


Review URL: http://codereview.chromium.org/8594001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110652 0039d316-1c4b-4281-b951-d872f2087c98

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.