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

chrome/browser/content_settings/mixed_content_settings_tab_helper.cc

Index: chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
diff --git a/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc b/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dc2d10f629946cf7ad2b9a73552655c7f88835b3
--- /dev/null
+++ b/chrome/browser/content_settings/mixed_content_settings_tab_helper.cc
@@ -0,0 +1,63 @@
+// Copyright (c) 2017 The Chromium Authors. All rights reserved.

[nasko, 2017/01/23 22:32:38]

nit: no "(c)".

[carlosk, 2017/02/08 02:59:02]

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/content_settings/mixed_content_settings_tab_helper.h"
+
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/site_instance.h"
+
+using content::BrowserThread;
+using content::WebContents;
+
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(MixedContentSettingsTabHelper);
+
+MixedContentSettingsTabHelper::MixedContentSettingsTabHelper(WebContents* tab)
+    : content::WebContentsObserver(tab) {
+  if (tab->HasOpener()) {

[nasko, 2017/01/23 22:32:37]

nit: if (!tab->HasOpener()) return; will yield a bit easier to read code as it
won't be as indented.

[carlosk, 2017/02/08 02:59:02]

Done.

+    // Note: using the opener WebContents to override these values only works
+    // because in Chrome these settings are maintained at the tab level instead
+    // of at the frame level as Blink does.
+    MixedContentSettingsTabHelper* opener_settings =
+        MixedContentSettingsTabHelper::FromWebContents(tab->GetOpener());
+    if (opener_settings) {
+      insecure_content_site_instance_ =
+          opener_settings->insecure_content_site_instance_;
+      is_running_insecure_content_allowed_ =
+          opener_settings->is_running_insecure_content_allowed_;
+    }
+  }
+}
+
+MixedContentSettingsTabHelper::~MixedContentSettingsTabHelper() {}
+
+void MixedContentSettingsTabHelper::AllowRunningOfInsecureContent() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!insecure_content_site_instance_ ||
+         insecure_content_site_instance_ == web_contents()->GetSiteInstance());
+  insecure_content_site_instance_ = web_contents()->GetSiteInstance();
+  is_running_insecure_content_allowed_ = true;
+}
+
+void MixedContentSettingsTabHelper::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
+    return;
+
+  // Resets mixed content settings on a successful navigation of the main frame
+  // to a different SiteInstance. This follows the renderer side behavior which
+  // is reset whenever a cross-site navigation takes place: a new main
+  // RenderFrame is created along with a new ContentSettingsObserver, causing
+  // the effective reset of the mixed content running permission.
+  // Note: even though on the renderer this setting exists on a per frame basis,
+  // it has always been controlled at the WebContents level. Its value is always
+  // inherited from the parent frame and when changed the whole tree is updated.
+  content::SiteInstance* new_site =
+      navigation_handle->GetRenderFrameHost()->GetSiteInstance();
+  if (new_site != insecure_content_site_instance_) {
+    insecure_content_site_instance_ = nullptr;
+    is_running_insecure_content_allowed_ = false;
+  }
+}