PlzNavigate: Move navigation-level mixed content checks to the browser.

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>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/request_context_type.h"
 #include "content/public/common/resource_response.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
+namespace blink {
+enum class WebMixedContentContextType;

[jam, 2017/01/09 21:15:46]

nit: why not just include the header here?

[carlosk, 2017/01/10 19:13:11]

Done. Agreed... Here and in all other places where I did this.

+}
+
 namespace content {
 
 // The LoFi state which determines whether to add the Lo-Fi header.
 enum LoFiState {
   // Let the browser process decide whether or not to request the Lo-Fi version.
   LOFI_UNSPECIFIED = 0,
 
   // Request a normal (non-Lo-Fi) version of the resource.
   LOFI_OFF,
 
@@ skipping 99 matching lines @@
 // 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,
-                        const base::Optional<url::Origin>& initiator_origin);
+  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,
+      const base::Optional<url::Origin>& initiator_origin);
   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.
   bool has_user_gesture;
 
   // True if the ServiceWorker should be skipped.
   bool skip_service_worker;
 
   // Indicates the request context type.
   RequestContextType request_context_type;
 
+  // The mixed content context type for potential mixed content checks.
+  blink::WebMixedContentContextType mixed_content_context_type;
+
   // See WebSearchableFormData for a description of these.
   GURL searchable_form_url;
   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;
 };
 
@@ skipping 178 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_