diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 18:36:23 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 18:36:23 +0000 |
| commit | 9d05f7f84520083b1ac0afb85733ba5d32e89f50 (patch) | |
| tree | c4e05fe7d59a2b783463ef19969c64b7d9b01838 /chrome_frame/test/chrome_frame_test_utils.cc | |
| parent | 0943370762f6d37ba3b9221d69e40c988df3e53a (diff) | |
| download | chromium_src-9d05f7f84520083b1ac0afb85733ba5d32e89f50.zip chromium_src-9d05f7f84520083b1ac0afb85733ba5d32e89f50.tar.gz chromium_src-9d05f7f84520083b1ac0afb85733ba5d32e89f50.tar.bz2 | |
Fixes to get the ChromeFrame IE6 builder on FYI green. I had to tweak the test expectations a bit because the OnQuit
notification does not seem to show up on IE6 for some reason. We can debug that later. The sideeffect of this would
be that the relevant tests which rely on the OnQuit notification would run for the duration of the loop.
We also needed to check in the ConnectToChromeFrame helper if we are already connected. This is for the AttachExternalTab
case where we could receive the NavigateComplete event twice.
While debugging this on my local IE6 VM I found that the calls to register/unregister chrome frame would take for ever
on the VM. This was because the ExceptionHandler would try to setup and unwind. This only works correctly for official
builds. To workaround this we launch the crash server for the duration of the test and run the chrome frame tests under
headless mode.
The FullTabModeIE_BackForwardAnchor test still fails on IE6. This is marked as FLAKY anyway. I will send out a separate CL
addressing this issue.
Review URL: http://codereview.chromium.org/1564018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_test_utils.cc')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index a96ef8d..0d9f5d2 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -650,6 +650,8 @@ void WebBrowserEventSink::SendMouseClick(int x, int y, void WebBrowserEventSink::ConnectToChromeFrame() { DCHECK(web_browser2_); + if (chrome_frame_.get()) + return; ScopedComPtr<IShellBrowser> shell_browser; DoQueryService(SID_STopLevelBrowser, web_browser2_, shell_browser.Receive()); |