Revert "First part of automated_ui_tests improvements."

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/common/url_constants.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
 // http://code.google.com/p/chromium/issues/detail?id=14731
 #define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
 // http://crbug.com/19394
 #define MAYBE_OpenCloseBrowserWindowWithAccelerator \
     DISABLED_OpenCloseBrowserWindowWithAccelerator
 #endif
 
 // http://code.google.com/p/chromium/issues/detail?id=14774
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_CloseTab DISABLED_CloseTab
 #define MAYBE_CloseBrowserWindow DISABLED_CloseBrowserWindow
 #else
 #define MAYBE_CloseTab CloseTab
 #define MAYBE_CloseBrowserWindow CloseBrowserWindow
 #endif
 
-// TODO(phajdan.jr): Enable FindInPageTest on Mac.
-#if !defined(OS_MACOSX)
-TEST_F(AutomatedUITestBase, FindInPage) {
-  ASSERT_TRUE(FindInPage());
-  bool is_visible;
-  ASSERT_TRUE(active_browser()->IsFindWindowFullyVisible(&is_visible));
-  EXPECT_TRUE(is_visible);
-}
-#endif  // !defined(OS_MACOSX)
-
-TEST_F(AutomatedUITestBase, Home) {
-  FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
-  GURL bot1(net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")));
-  NavigateToURL(bot1);  // To help verify that Home does something.
-
-  ASSERT_TRUE(Home());
-
-  GURL url;
-  ASSERT_TRUE(active_browser()->GetActiveTab()->GetCurrentURL(&url));
-  EXPECT_EQ(GURL(chrome::kAboutBlankURL), url);
-
-  std::wstring title;
-  ASSERT_TRUE(active_browser()->GetActiveTab()->GetTabTitle(&title));
-  EXPECT_EQ(L"", title);
-}
-
 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);
@@ skipping 242 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);
 }
-
-TEST_F(AutomatedUITestBase, SelectTab) {
-  FilePath filename(test_data_directory_);
-  filename = filename.AppendASCII("title2.html");
-  GURL url = net::FilePathToFileURL(filename);
-
-  ASSERT_TRUE(active_browser()->AppendTab(url));
-  ASSERT_TRUE(active_browser()->AppendTab(url));
-
-  int active_tab_index;
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(2, active_tab_index);
-
-  ASSERT_TRUE(SelectNextTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(0, active_tab_index);
-
-  ASSERT_TRUE(SelectNextTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(1, active_tab_index);
-
-  ASSERT_TRUE(SelectPreviousTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(0, active_tab_index);
-
-  ASSERT_TRUE(SelectPreviousTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(2, active_tab_index);
-
-  ASSERT_TRUE(SelectPreviousTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(1, active_tab_index);
-
-  ASSERT_TRUE(SelectNextTab());
-  ASSERT_TRUE(active_browser()->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(2, active_tab_index);
-}
-
-// TODO(phajdan.jr): Enable ShowBookmarkBar on Mac.
-#if !defined(OS_MACOSX)
-TEST_F(AutomatedUITestBase, ShowBookmarkBar) {
-  ASSERT_TRUE(ShowBookmarkBar());
-  bool is_visible;
-  bool is_animating;
-  ASSERT_TRUE(active_browser()->GetBookmarkBarVisibility(&is_visible,
-                                                         &is_animating));
-  ASSERT_TRUE(is_visible);
-  ASSERT_FALSE(is_animating);
-
-  // Try second time to make sure it won't make the bookmark bar
-  // disappear.
-  ASSERT_TRUE(ShowBookmarkBar());
-  ASSERT_TRUE(active_browser()->GetBookmarkBarVisibility(&is_visible,
-                                                         &is_animating));
-  ASSERT_TRUE(is_visible);
-  ASSERT_FALSE(is_animating);
-}
-#endif  // !defined(OS_MACOSX)
-
-TEST_F(AutomatedUITestBase, ShowDownloads) {
-  ASSERT_TRUE(ShowDownloads());
-  GURL url;
-  ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
-  ASSERT_EQ(GURL(chrome::kChromeUIDownloadsURL), url);
-}
-
-TEST_F(AutomatedUITestBase, ShowHistory) {
-  ASSERT_TRUE(ShowHistory());
-  GURL url;
-  ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
-  ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url);
-}