Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/public/browser/web_contents_observer.h

Index: content/public/browser/web_contents_observer.h
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index e2c42d0eefd9afc07bb09af1a0415f35dff06e6e..7537836889adc9c520acb6fbcd3b0e42856d0129 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -154,13 +154,13 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
   // Called when a navigation encountered a server redirect.
   virtual void DidRedirectNavigation(NavigationHandle* navigation_handle) {}
 
-  // PlzNavigate
   // Called when the navigation is ready to be committed in a renderer. Most
   // observers should use DidFinishNavigation instead, which happens right
   // after the navigation commits. This method is for observers that want to
   // initialize renderer-side state just before the RenderFrame commits the
   // navigation.
   //
+  // PlzNavigate
   // This is the first point in time where a RenderFrameHost is associated with
   // the navigation.
   virtual void ReadyToCommitNavigation(NavigationHandle* navigation_handle) {}