Revert of Ensure that modal dialogs from subframes can be cleaned up correctly.

content/browser/web_contents/web_contents_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 647 matching lines @@
   void OnWebContentsDestroyed(WebContentsImpl* web_contents);
 
   // Creates and adds to the map a destruction observer watching |web_contents|.
   // No-op if such an observer already exists.
   void AddDestructionObserver(WebContentsImpl* web_contents);
 
   // Deletes and removes from the map a destruction observer
   // watching |web_contents|. No-op if there is no such observer.
   void RemoveDestructionObserver(WebContentsImpl* web_contents);
 
-  // Callback function when showing JavaScript dialogs.  Takes in a routing ID
-  // pair to identify the RenderFrameHost that opened the dialog, because it's
-  // possible for the RenderFrameHost to be deleted by the time this is called.
-  void OnDialogClosed(int render_process_id,
-                      int render_frame_id,
+  // Callback function when showing JavaScript dialogs.
+  void OnDialogClosed(RenderFrameHost* rfh,
                       IPC::Message* reply_msg,
                       bool dialog_was_suppressed,
                       bool success,
                       const base::string16& user_input);
 
   // Callback function when requesting permission to access the PPAPI broker.
   // |result| is true if permission was granted.
   void OnPpapiBrokerPermissionResult(int routing_id, bool result);
 
   bool OnMessageReceived(RenderViewHost* render_view_host,
@@ skipping 412 matching lines @@
 
   // Whether the last JavaScript dialog shown was suppressed. Used for testing.
   bool last_dialog_suppressed_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_