Not for commint: Revert 6ed4d4373c5ce4743850df50f94b867240472033

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 26d6d9c10ec419a973039f8cc330727dbccfc064..c6b76259490848d2ffec31896e0b3693d0464571 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2296,6 +2296,13 @@ void RenderFrameImpl::OnFocusedFormFieldDataRequest(int request_id) {
                                                      field));
 }
 
+bool RenderFrameImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
+  if (RenderThreadImpl::current())
+    RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
+  message->EnableMessagePumping();
+  return Send(message);
+}
+
 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
                                            const base::string16& message,
                                            const base::string16& default_value,
@@ -2320,7 +2327,7 @@ bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
   if (!result)
     result = &result_temp;
 
-  Send(new FrameHostMsg_RunJavaScriptMessage(
+  SendAndRunNestedMessageLoop(new FrameHostMsg_RunJavaScriptMessage(
       routing_id_, message, default_value, frame_url, type, &success, result));
   return success;
 }