Commit ad7cb8bd authored by Carlos IL's avatar Carlos IL Committed by Commit Bot

Disable MessagingInterstitial test for committed interstitials

This test was added as part of a fix for a crash that occurred due to
interstitials not having an associated web contents.
With committed interstitials enabled, interstitials are no longer a
special case, and do have a web contents, so the special conditions
that are checked in this test no longer apply.

Bug: 752372
Change-Id: Id06e38674dd17f97a467f98b5759433aad8cd6ec
Reviewed-on: https://chromium-review.googlesource.com/c/1313675Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607634}
parent 169e31d0
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <utility> #include <utility>
#include "base/base64.h" #include "base/base64.h"
#include "base/feature_list.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
...@@ -220,6 +222,13 @@ IN_PROC_BROWSER_TEST_P(MessagingApiTest, MessagingInterstitial) { ...@@ -220,6 +222,13 @@ IN_PROC_BROWSER_TEST_P(MessagingApiTest, MessagingInterstitial) {
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; return;
#endif #endif
// TODO(carlosil): Completely remove this test once committed interstitials
// fully launch.
// With committed interstitials enabled, interstitials are no longer a
// special case, and do have a web contents, so the special conditions
// that are checked in this test no longer apply.
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials))
return;
net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME);
ASSERT_TRUE(https_server.Start()); ASSERT_TRUE(https_server.Start());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment