PlzNavigate: don't stop all loaders when renderer-initiated nav fails

content/common/navigation_params.h

 // Copyright 2014 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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 138 matching lines @@
   // Whether or not the CSP of the main world should apply. When the navigation
   // is initiated from a content script in an isolated world, the CSP defined
   // in the main world should not apply.
   // TODO(arthursonzogni): Instead of this boolean, the origin of the isolated
   // world which has initiated the navigation should be passed.
   // See https://crbug.com/702540
   CSPDisposition should_check_main_world_csp;
 };
 
 // Provided by the renderer ----------------------------------------------------
-//
+
+const int kInvalidRenderNavigationId = -1;
+
 // This struct holds parameters sent by the renderer to the browser. It is only
 // used in PlzNavigate (since in the current architecture, the renderer does not
 // inform the browser of navigations until they commit).
 
 // This struct is not used outside of the PlzNavigate project.
 // PlzNavigate: parameters needed to start a navigation on the IO thread,
 // following a renderer-initiated navigation request.
 struct CONTENT_EXPORT BeginNavigationParams {
   // TODO(clamy): See if it is possible to reuse this in
   // ResourceMsg_Request_Params.
   BeginNavigationParams();
   BeginNavigationParams(
       std::string headers,
       int load_flags,
       bool has_user_gesture,
       bool skip_service_worker,
       RequestContextType request_context_type,
       blink::WebMixedContentContextType mixed_content_context_type,
       bool is_form_submission,
-      const base::Optional<url::Origin>& initiator_origin);
+      const base::Optional<url::Origin>& initiator_origin,
+      int renderer_navigation_id);
   BeginNavigationParams(const BeginNavigationParams& other);
   ~BeginNavigationParams();
 
   // Additional HTTP request headers.
   std::string headers;
 
   // net::URLRequest load flags (net::LOAD_NORMAL) by default).
   int load_flags;
 
   // True if the request was user initiated.
@@ skipping 16 matching lines @@
   std::string searchable_form_encoding;
 
   // Indicates the initiator of the request. In auxilliary navigations, this is
   // the origin of the document that triggered the navigation. This parameter
   // can be null during browser-initiated navigations.
   base::Optional<url::Origin> initiator_origin;
 
   // If the transition type is a client side redirect, then this holds the URL
   // of the page that had the client side redirect.
   GURL client_side_redirect_url;
+
+  // ID provided by the renderer to identify this navigation. It will be sent
+  // back to the renderer if the browser decides to drop the navigation.
+  // kInvalidRenderNavigationId means that this navigation wasn't initiated by
+  // the renderer process through the BeginNavigation IPC.
+  int renderer_navigation_id;
 };
 
 // Provided by the browser -----------------------------------------------------
 //
 // These structs are sent by the browser to the renderer to start/commit a
 // navigation depending on whether browser-side navigation is enabled.
 // Parameters used both in the current architecture and PlzNavigate should be
 // put in RequestNavigationParams.  Parameters only used by the current
 // architecture should go in StartNavigationParams.
 
@@ skipping 176 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_