diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:24:14 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:24:14 +0000 |
| commit | 459773c256a5d5f7d001298481c8e503a5a1f588 (patch) | |
| tree | 485d9611ad1b22cdb5c76c2130a9f20819948eaa /chrome/test/in_process_browser_test.h | |
| parent | be8751c1fe155a0c7405ccda69458b0902b97440 (diff) | |
| download | chromium_src-459773c256a5d5f7d001298481c8e503a5a1f588.zip chromium_src-459773c256a5d5f7d001298481c8e503a5a1f588.tar.gz chromium_src-459773c256a5d5f7d001298481c8e503a5a1f588.tar.bz2 | |
Makes tests on chromeos not run a nested message loop.
I had to do two changes to existing tests to get these to work:
. Wizard tests wait until all the wizard related classes have been destroyed. At the time the tests want to quit the wizard classes haven't been shut down, so I needed to add an event to know when this happens. See comment as to why this is the case.
. PanelBrowserTests were flakey because they were waiting for page to load, which can happen before javascript finishes completing.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1735001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.h')
| -rw-r--r-- | chrome/test/in_process_browser_test.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h index 0c26123..2b63b7f 100644 --- a/chrome/test/in_process_browser_test.h +++ b/chrome/test/in_process_browser_test.h @@ -115,10 +115,9 @@ class InProcessBrowserTest : public testing::Test { void EnableSingleProcess() { single_process_ = true; } private: -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) +#if defined(OS_MACOSX) // Old variant of RunTestOnMainThreadLoop that assumes a nested message loop. - // TODO(sky): nuke this once we straighten out properly exiting on the mac - // and chromeos sides. + // TODO(sky): nuke this once we straighten out properly exiting on the mac. void RunTestOnMainThreadLoopDeprecated(); #endif |