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

Trivial tweaks to get most of it to build on Linux.

BUG=none
TEST=run ui_tests --gtest_filter=AutomatedUITestBase, verify that six to eight are enabled and all pass

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

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

2 files changed, 17 insertions, 4 deletions

diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index 45aa1b9..696406aa 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -81,6 +81,7 @@ bool AutomatedUITestBase::DuplicateTab() {
   return RunCommand(IDC_DUPLICATE_TAB);
 }
 
+#if defined(OS_WIN)
 bool AutomatedUITestBase::DragTabOut() {
   BrowserProxy* browser = active_browser();
   if (browser == NULL) {
@@ -235,6 +236,7 @@ bool AutomatedUITestBase::DragActiveTab(bool drag_right) {
 
   return true;
 }
+#endif
 
 bool AutomatedUITestBase::ForwardButton() {
   return RunCommand(IDC_FORWARD);
@@ -246,7 +248,7 @@ bool AutomatedUITestBase::GoOffTheRecord() {
 
 bool AutomatedUITestBase::OpenAndActivateNewBrowserWindow(
     scoped_refptr<BrowserProxy>* previous_browser) {
-  if (!automation()->OpenNewBrowserWindow(SW_SHOWNORMAL)) {
+  if (!automation()->OpenNewBrowserWindow(true /* SW_SHOWNORMAL */)) {
     LogWarningMessage("failed_to_open_new_browser_window");
     return false;
   }
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
index 3110aae..491e45e 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -10,6 +10,17 @@
 #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);
@@ -34,7 +45,7 @@ TEST_F(AutomatedUITestBase, DuplicateTab) {
   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);
@@ -178,7 +189,7 @@ TEST_F(AutomatedUITestBase, CloseBrowserWindow) {
   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);
@@ -208,7 +219,7 @@ TEST_F(AutomatedUITestBase, IncognitoWindow) {
   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.