summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 23:59:57 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 23:59:57 +0000
commit05c52c546db0063c3deeea613b4b427de30c6d68 (patch)
tree42075f7aea412f84976b2024d657d4ec9c63a2bb /chrome/test/ui/ui_test.h
parent0f9f7c59cebc0a34a83aacf7321e44972e222f26 (diff)
downloadchromium_src-05c52c546db0063c3deeea613b4b427de30c6d68.zip
chromium_src-05c52c546db0063c3deeea613b4b427de30c6d68.tar.gz
chromium_src-05c52c546db0063c3deeea613b4b427de30c6d68.tar.bz2
Give UITest ability to have MessageLoopforUI message loop instead of the default one.
ExternalTabContainer tests create the host window and the automationproxy in the main thread, that will cause deadlock (especially when host window is visible). Added test for openening popup windows. TEST=ui_tests Review URL: http://codereview.chromium.org/661028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index a18b14b..d985026 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -53,6 +53,7 @@ class UITestBase {
// Constructor
UITestBase();
+ explicit UITestBase(MessageLoop::Type msg_loop_type);
virtual ~UITestBase();
@@ -618,6 +619,10 @@ class UITestBase {
class UITest : public UITestBase, public PlatformTest {
protected:
+ UITest() {}
+ explicit UITest(MessageLoop::Type msg_loop_type)
+ : UITestBase(msg_loop_type), PlatformTest() {
+ }
virtual void SetUp();
virtual void TearDown();
};