Rename RFO::FrameWillClose() to reflect its actual purpose.

content/public/renderer/render_frame_observer.h

 // Copyright 2013 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_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
 #include "v8/include/v8.h"
 
 namespace blink {
 class WebFormElement;
-class WebFrame;
+class WebLocalFrame;
 class WebNode;
 class WebString;
 struct WebURLError;
 }
 
 namespace content {
 
 class RendererPpapiHost;
 class RenderFrame;
 class RenderFrameImpl;
@@ skipping 17 matching lines @@
   // Called when the RenderFrame visiblity is changed.
   virtual void WasHidden() {}
   virtual void WasShown() {}
 
   // Called when associated widget is about to close.
   virtual void WidgetWillClose() {}
 
   // These match the Blink API notifications
   virtual void DidCreateNewDocument() {}
   virtual void DidCreateDocumentElement() {}
+  // Called when a provisional load is about to commit in a frame. This is
+  // dispatched just before the Javascript unload event.
+  virtual void WillCommitProvisionalLoad() {}

[dcheng, 2016/09/30 06:20:42]

Looking at how this is used, I think these could all just be folded into
DidCommitProvisionalLoad. I'd like to try that in a followup CL, if it makes
sense to everyone.

   virtual void DidCommitProvisionalLoad(bool is_new_navigation,
                                         bool is_same_page_navigation) {}
   virtual void DidStartProvisionalLoad() {}
   virtual void DidFailProvisionalLoad(const blink::WebURLError& error) {}
   virtual void DidFinishLoad() {}
   virtual void DidFinishDocumentLoad() {}
   virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                       int extension_group,
                                       int world_id) {}
   virtual void WillReleaseScriptContext(v8::Local<v8::Context> context,
                                         int world_id) {}
   virtual void DidClearWindowObject() {}
   virtual void DidChangeManifest() {}
   virtual void DidChangeScrollOffset() {}
   virtual void WillSendSubmitEvent(const blink::WebFormElement& form) {}
   virtual void WillSubmitForm(const blink::WebFormElement& form) {}
   virtual void DidMatchCSS(
       const blink::WebVector<blink::WebString>& newly_matching_selectors,
       const blink::WebVector<blink::WebString>& stopped_matching_selectors) {}
 
-  // Called before FrameWillClose, when this frame has been detached from the
-  // view, but has not been closed yet. This *will* be called when parent frames
-  // are closing. Since the frame is already detached from the DOM at this time
-  // it should not be inspected.
+  // Called when this frame has been detached from the view. This *will* be
+  // called for child frames when a parent frame is detached. Since the frame is
+  // already detached from the DOM at this time, it should not be inspected.
   virtual void FrameDetached() {}
 
-  // Called when the frame will soon be closed. This is the last opportunity to
-  // send messages to the host (e.g., for clean-up, shutdown, etc.). This is
-  // *not* called on child frames when parent frames are being closed.
-  virtual void FrameWillClose() {}
-
   // Called when we receive a console message from Blink for which we requested
   // extra details (like the stack trace). |message| is the error message,
   // |source| is the Blink-reported source of the error (either external or
   // internal), and |stack_trace| is the stack trace of the error in a
   // human-readable format (each frame is formatted as
   // "\n    at function_name (source:line_number:column_number)").
   virtual void DetailedConsoleMessageAdded(const base::string16& message,
                                            const base::string16& source,
                                            const base::string16& stack_trace,
                                            uint32_t line_number,
@@ skipping 46 matching lines @@
   RenderFrame* render_frame_;
   // The routing ID of the associated RenderFrame.
   int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_