Clean up Chromium code to follow message loop reentrancy fix in WebKit (https://bugs.webkit.org/show_bug.cgi?id=41697)

BUG=36438
TEST=DevToolsSanityTest.TestMessageLoopReentrant

Review URL: http://codereview.chromium.org/2965002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 9 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index d0d9eed..30be754 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -224,7 +224,6 @@ void RenderThread::Init() {
   is_incognito_process_ = false;
   suspend_webkit_shared_timer_ = true;
   notify_webkit_of_modal_loop_ = true;
-  did_notify_webkit_of_modal_loop_ = false;
   plugin_refresh_allowed_ = true;
   cache_stats_task_pending_ = false;
   widget_count_ = 0;
@@ -346,12 +345,8 @@ bool RenderThread::Send(IPC::Message* msg) {
     if (suspend_webkit_shared_timer)
       webkit_client_->SuspendSharedTimer();
 
-    // WebKit does not like nested calls to willEnterModalLoop.
-    // TODO(darin): Fix WebKit to allow nesting.
-    if (notify_webkit_of_modal_loop && !did_notify_webkit_of_modal_loop_) {
+    if (notify_webkit_of_modal_loop)
       WebView::willEnterModalLoop();
-      did_notify_webkit_of_modal_loop_ = true;
-    }
 
     RenderWidget* widget =
         static_cast<RenderWidget*>(ResolveRoute(msg->routing_id()));
@@ -370,10 +365,8 @@ bool RenderThread::Send(IPC::Message* msg) {
           new PluginMsg_ResetModalDialogEvent(host_window));
     }
 
-    if (notify_webkit_of_modal_loop && did_notify_webkit_of_modal_loop_) {
+    if (notify_webkit_of_modal_loop)
       WebView::didExitModalLoop();
-      did_notify_webkit_of_modal_loop_ = false;
-    }
 
     if (suspend_webkit_shared_timer)
       webkit_client_->ResumeSharedTimer();