4 files changed, 14 insertions, 8 deletions
diff --git a/chrome_frame/test/data/no_interference/window_open.html b/chrome_frame/test/data/no_interference/window_open.html
index b426b17..a8b1c37 100644
--- a/chrome_frame/test/data/no_interference/window_open.html
+++ b/chrome_frame/test/data/no_interference/window_open.html
@@ -1,12 +1,13 @@
 <html>
   <head>
     <script type="text/javascript">
-      window.onload = function() {
+      function popup() {
         window.open("empty.html", "test");
       }
     </script>
   </head>
-  <body>
+
+  <body ondblclick="popup();">
     Calling window.open...
   </body>
 </html>
 \ No newline at end of file
diff --git a/chrome_frame/test/no_interference_test.cc b/chrome_frame/test/no_interference_test.cc
index 3731b04c..e90dfe5 100644
--- a/chrome_frame/test/no_interference_test.cc
+++ b/chrome_frame/test/no_interference_test.cc
@@ -136,7 +136,12 @@ TEST_F(NoInterferenceTest, FLAKY_JavascriptWindowOpen) {
       testing::StrictMock<MockWebBrowserEventSink> > new_window_mock;
 
   mock_.ExpectNavigationInIE(kWindowOpenUrl);
-  EXPECT_CALL(mock_, OnIELoad(testing::StrCaseEq(kWindowOpenUrl)));
+  EXPECT_CALL(mock_, OnIELoad(testing::StrCaseEq(kWindowOpenUrl)))
+      .WillOnce(testing::DoAll(
+          DelaySendMouseClickToIE(&mock_, &loop_, 0, 100, 100,
+                                  simulate_input::LEFT),
+          DelaySendMouseClickToIE(&mock_, &loop_, 0, 100, 100,
+                                  simulate_input::LEFT)));
 
   mock_.ExpectNewWindowWithIE(empty_page_url(), &new_window_mock);
   EXPECT_CALL(new_window_mock, OnIELoad(testing::StrCaseEq(empty_page_url())))
diff --git a/chrome_frame/test/test_mock_with_web_server.cc b/chrome_frame/test/test_mock_with_web_server.cc
index 0611a9d..59faaab 100644
--- a/chrome_frame/test/test_mock_with_web_server.cc
+++ b/chrome_frame/test/test_mock_with_web_server.cc
@@ -203,11 +203,6 @@ ACTION_P6(DelaySendMouseClick, mock, loop, delay, x, y, button) {
       &MockWebBrowserEventSink::SendMouseClick, x, y, button), delay);
 }
 
-ACTION_P4(DelaySendChar, loop, delay, c, mod) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendCharA, c, mod), delay);
-}
-
 ACTION_P3(DelaySendString, loop, delay, str) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
       simulate_input::SendStringW, str), delay);
diff --git a/chrome_frame/test/test_mock_with_web_server.h b/chrome_frame/test/test_mock_with_web_server.h
index 99fc0fe..dfec957 100644
--- a/chrome_frame/test/test_mock_with_web_server.h
+++ b/chrome_frame/test/test_mock_with_web_server.h
@@ -123,6 +123,11 @@ ACTION_P5(ValidateWindowSize, mock, left, top, width, height) {
   EXPECT_EQ(actual_height, height);
 }
 
+ACTION_P4(DelaySendChar, loop, delay, c, mod) {
+  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
+      simulate_input::SendCharA, c, mod), delay);
+}
+
 }  // namespace chrome_frame_test
 
 #endif  // CHROME_FRAME_TEST_MOCK_WITH_WEB_SERVER_H_