Automated ui test porting + cleanup:...

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 #include "views/event.h"
 
+#if defined(OS_MACOSX)
+#define MAYBE_WindowGetViewBounds DISABLED_WindowGetViewBounds
+#else
+#define MAYBE_WindowGetViewBounds WindowGetViewBounds
+#endif
+
 class AutomationProxyTest : public UITest {
  protected:
   AutomationProxyTest() {
     dom_automation_enabled_ = true;
     launch_arguments_.AppendSwitchWithValue(switches::kLang,
                                             L"en-US");
   }
 };
 
 TEST_F(AutomationProxyTest, GetBrowserWindowCount) {
@@ skipping 15 matching lines @@
     scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(-1));
     ASSERT_FALSE(window.get());
   }
 
   {
     scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(1));
     ASSERT_FALSE(window.get());
   }
 };
 
-// TODO(port): This test is for Chrome Views, which we only use on Windows.
-// Maybe split this into a _win.cc file?
-#if defined(OS_WIN)
-TEST_F(AutomationProxyVisibleTest, WindowGetViewBounds) {
+// TODO(estade): port automation provider for this test to mac.
+TEST_F(AutomationProxyVisibleTest, MAYBE_WindowGetViewBounds) {
   {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     ASSERT_TRUE(browser.get());
     scoped_refptr<WindowProxy> window(browser->GetWindow());
     ASSERT_TRUE(window.get());
 
     scoped_refptr<TabProxy> tab1(browser->GetTab(0));
     ASSERT_TRUE(tab1.get());
     GURL tab1_url;
     ASSERT_TRUE(tab1->GetCurrentURL(&tab1_url));
@@ skipping 67 matching lines @@
     ASSERT_TRUE(tab2.get());
     GURL tab2_new_url;
     ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
     EXPECT_EQ(tab1_url.spec(), tab2_new_url.spec());
     EXPECT_EQ(tab2_url.spec(), tab1_new_url.spec());
 
     */
   }
 }
-#endif  // defined(OS_WIN)
 
 TEST_F(AutomationProxyTest, GetTabCount) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   int tab_count = 0;
   ASSERT_TRUE(window->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 }
 
@@ skipping 282 matching lines @@
   // now, test that we can get multiple cookies:
   ASSERT_TRUE(tab->SetCookie(url, "foo1=baz1"));
   ASSERT_TRUE(tab->SetCookie(url, "foo2=baz2"));
 
   ASSERT_TRUE(tab->GetCookies(url, &value_result));
   ASSERT_FALSE(value_result.empty());
   EXPECT_TRUE(value_result.find("foo1=baz1") != std::string::npos);
   EXPECT_TRUE(value_result.find("foo2=baz2") != std::string::npos);
 }
 
-// TODO(port): Determine what tests need this and port.
-#if defined(OS_WIN)
-TEST_F(AutomationProxyTest, GetHWND) {
-  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(browser.get());
-  scoped_refptr<WindowProxy> window(browser->GetWindow());
-  ASSERT_TRUE(window.get());
-
-  HWND handle;
-  ASSERT_TRUE(window->GetHWND(&handle));
-  ASSERT_TRUE(handle);
-}
-#endif
-
 TEST_F(AutomationProxyTest, NavigateToURLAsync) {
   AutomationProxy* automation_object = automation();
   scoped_refptr<BrowserProxy> window(automation_object->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("cookie1.html");
   GURL newurl = net::FilePathToFileURL(filename);
@@ skipping 705 matching lines @@
 
   // Allow some time for the popup to show up and close.
   PlatformThread::Sleep(2000);
 
   std::wstring expected(L"string");
   std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
   std::wstring actual;
   ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
   ASSERT_EQ(expected, actual);
 }