summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_uitest.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 19:57:24 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 19:57:24 +0000
commit8dd404bbb05b99e7ee13b4e70899ebbcaeb3e8fb (patch)
tree0e4b5ba4be534f7e769db542d0882d6983fcb59a /chrome/browser/browser_uitest.cc
parent24f4035eb84f25a51bf7ed6696671c99bf89bb25 (diff)
downloadchromium_src-8dd404bbb05b99e7ee13b4e70899ebbcaeb3e8fb.zip
chromium_src-8dd404bbb05b99e7ee13b4e70899ebbcaeb3e8fb.tar.gz
chromium_src-8dd404bbb05b99e7ee13b4e70899ebbcaeb3e8fb.tar.bz2
Automated ui test porting + cleanup:
- Change POINTs to gfx::Point - Get rid of 2 unused automation messages (the messages themselves are staying for now so we don't mess with the reference build) -- add new automation messages to replace GetWindowHWND, which is not portable - re-enable automated_ui_test_interactive_test (it seems to have been dropped when we converted to gyp) - compile additional tests on linux (they don't pass, so they are disabled) - stub out linux tab dragging automation implementation (browser side) - delete various cruft BUG=19758 Review URL: http://codereview.chromium.org/211033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_uitest.cc')
-rw-r--r--chrome/browser/browser_uitest.cc17
1 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index a9d93b7..1ef62a1 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -24,17 +24,6 @@
namespace {
class BrowserTest : public UITest {
- protected:
-#if defined(OS_WIN)
- HWND GetMainWindow() {
- scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
- scoped_refptr<WindowProxy> window(browser->GetWindow());
-
- HWND window_handle;
- EXPECT_TRUE(window->GetHWND(&window_handle));
- return window_handle;
- }
-#endif
};
class VisibleBrowserTest : public UITest {
@@ -53,10 +42,8 @@ TEST_F(BrowserTest, WindowsSessionEnd) {
NavigateToURL(net::FilePathToFileURL(test_file));
PlatformThread::Sleep(action_timeout_ms());
- // Simulate an end of session. Normally this happens when the user
- // shuts down the pc or logs off.
- HWND window_handle = GetMainWindow();
- ASSERT_TRUE(::PostMessageW(window_handle, WM_ENDSESSION, 0, 0));
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser->TerminateSession());
PlatformThread::Sleep(action_timeout_ms());
ASSERT_FALSE(IsBrowserRunning());