summaryrefslogtreecommitdiffstats
path: root/chrome/test/automated_ui_tests
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-21 01:21:48 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-21 01:21:48 +0000
commit82a200191df08bab26f78240af1883ca46b1942f (patch)
tree0ff39c52e8e86e0eff79f88d74d35bd003e8960e /chrome/test/automated_ui_tests
parent58567187439fdcad4cf4fdc39a1d92668b7afbb8 (diff)
downloadchromium_src-82a200191df08bab26f78240af1883ca46b1942f.zip
chromium_src-82a200191df08bab26f78240af1883ca46b1942f.tar.gz
chromium_src-82a200191df08bab26f78240af1883ca46b1942f.tar.bz2
Refactor automation wrappers. Move the methods from AutomationProxy to the appropriate classes.
Review URL: http://codereview.chromium.org/18335 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 81d0f0b..0a4981e 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -825,13 +825,13 @@ bool AutomatedUITest::DragActiveTab(bool drag_right, bool drag_out) {
WindowProxy* AutomatedUITest::GetAndActivateWindowForBrowser(
BrowserProxy* browser) {
- WindowProxy* window = automation()->GetWindowForBrowser(browser);
-
bool did_timeout;
if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(), &did_timeout)) {
AddWarningAttribute("failed_to_bring_window_to_front");
return NULL;
}
+
+ WindowProxy* window = browser->GetWindow();
return window;
}