Move automated_ui_test_test to ui_tests from a library so it actually gets ru...

chrome/test/automated_ui_tests/automated_ui_test_test.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
+#if defined(OS_MACOSX)
+// The window pops up, but doesn't close.
+#define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
+#define MAYBE_OpenCloseBrowserWindowWithAccelerator \
+    DISABLED_OpenCloseBrowserWindowWithAccelerator
+#else
+#define MAYBE_IncognitoWindow IncognitoWindow
+#define MAYBE_OpenCloseBrowserWindowWithAccelerator \
+    OpenCloseBrowserWindowWithAccelerator
+#endif
+
 TEST_F(AutomatedUITestBase, NewTab) {
   int tab_count;
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   NewTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   NewTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(3, tab_count);
 }
 
 TEST_F(AutomatedUITestBase, DuplicateTab) {
   int tab_count;
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   DuplicateTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   DuplicateTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(3, tab_count);
 }
 
-TEST_F(AutomatedUITestBase, RestoreTab) {
+TEST_F(AutomatedUITestBase, DISABLED_RestoreTab) {
   int tab_count;
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   NewTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
   GURL test_url = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html"));
   GetActiveTab()->NavigateToURL(test_url);
   CloseActiveTab();
@@ skipping 123 matching lines @@
   } else {
     ASSERT_EQ(3, tab_count);
     ASSERT_TRUE(CloseActiveWindow());
     active_browser()->GetTabCount(&tab_count);
     ASSERT_EQ(2, tab_count);
   }
 
   ASSERT_FALSE(CloseActiveWindow());
 }
 
-TEST_F(AutomatedUITestBase, IncognitoWindow) {
+TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
   int num_browser_windows;
   int num_normal_browser_windows;
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(1, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   ASSERT_TRUE(GoOffTheRecord());
   ASSERT_TRUE(GoOffTheRecord());
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(3, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   // There is only one normal window so it will not be closed.
   ASSERT_FALSE(CloseActiveWindow());
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(3, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(1, num_browser_windows);
 }
 
-TEST_F(AutomatedUITestBase, OpenCloseBrowserWindowWithAccelerator) {
+TEST_F(AutomatedUITestBase, MAYBE_OpenCloseBrowserWindowWithAccelerator) {
   // Note: we don't use RunCommand(IDC_OPEN/CLOSE_WINDOW) to open/close
   // browser window in automated ui tests. Instead we use
   // OpenAndActivateNewBrowserWindow and CloseActiveWindow.
   // There are other parts of UI test that use the accelerators. This is
   // a unit test for those usage.
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   int num_browser_windows;
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(2, num_browser_windows);
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
@@ skipping 43 matching lines @@
   ASSERT_TRUE(BackButton());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url1, url);
   ASSERT_TRUE(ForwardButton());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
   ASSERT_TRUE(ReloadPage());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
 }