Convert MimeHandlerStreamManager to use the new navigation callbacks.

extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

 // Copyright 2015 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.
 
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ skipping 66 matching lines @@
   EmbedderObserver(MimeHandlerStreamManager* stream_manager,
                    const std::string& view_id,
                    int frame_tree_node_id,
                    int render_process_id,
                    int render_frame_id);
 
  private:
   // WebContentsObserver overrides.
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void RenderProcessGone(base::TerminationStatus status) override;
-  void DidStartProvisionalLoadForFrame(
-      content::RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      bool is_error_page) override;
   void WebContentsDestroyed() override;
   void DidStartNavigation(
       content::NavigationHandle* navigation_handle) override;
+  void ReadyToCommitNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void RenderFrameHostChanged(content::RenderFrameHost* old_host,
                               content::RenderFrameHost* new_host) override;
 
   void AbortStream();
 
   bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host);
 
   MimeHandlerStreamManager* const stream_manager_;
   const std::string view_id_;
   int frame_tree_node_id_;
   int render_process_id_;
   int render_frame_id_;
-  // With PlzNavigate we get an initial provisional load notification for the
-  // URL the mime handler is serving. We don't want to clean up the stream
-  // here. This field helps us track the first load notification. Defaults
-  // to true.
+  // We get an initial  load notification for the URL the mime handler is
+  // serving. We don't want to clean up the stream here. This field helps us
+  // track the first load notification. Defaults to true.
   bool initial_load_for_frame_;
   // If a RFH is swapped with another RFH, this is set to the new RFH. This
   // ensures that we don't inadvarently clean up the stream when the old RFH
   // dies.
   content::RenderFrameHost* new_host_;
 };
 
 MimeHandlerStreamManager::MimeHandlerStreamManager()
     : extension_registry_observer_(this) {
 }
@@ skipping 78 matching lines @@
   if (!IsTrackedRenderFrameHost(render_frame_host))
     return;
   AbortStream();
 }
 
 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone(
     base::TerminationStatus status) {
   AbortStream();
 }
 
-void MimeHandlerStreamManager::EmbedderObserver::
-    DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host,
-                                    const GURL& validated_url,
-                                    bool is_error_page) {
-  if (!IsTrackedRenderFrameHost(render_frame_host))
+void MimeHandlerStreamManager::EmbedderObserver::ReadyToCommitNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (navigation_handle->IsSamePage() ||
+      !IsTrackedRenderFrameHost(navigation_handle->GetRenderFrameHost())) {
     return;
-  // With PlzNavigate we get a provisional load notification for the URL we are
-  // serving. We don't want to clean up the stream here.
-  if (initial_load_for_frame_ && content::IsBrowserSideNavigationEnabled()) {
+  }
+
+  // We get an initial load notification for the URL we are serving. We don't
+  // want to clean up the stream here.
+  if (initial_load_for_frame_) {
     initial_load_for_frame_ = false;
     return;
   }
   AbortStream();
 }
 
 void MimeHandlerStreamManager::EmbedderObserver::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   // If the top level frame is navigating away, clean up the stream.
   if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage())
@@ skipping 50 matching lines @@
   if (frame_tree_node_id_ != -1) {
     return render_frame_host->GetFrameTreeNodeId() == frame_tree_node_id_;
   } else {
     DCHECK((render_frame_id_ != -1) && (render_process_id_ != -1));
     return render_frame_host->GetRoutingID() == render_frame_id_ &&
            render_frame_host->GetProcess()->GetID() == render_process_id_;
   }
 }
 
 }  // namespace extensions