Cleanup kSupervisedUserCommittedInterstitials flag.

Feature launched in M70, and has been default enabled since, this CL
removes the flag from Chrome's code, and the switch from
chrome://flags

Bug: 936008
Change-Id: I57772ccc041b137255e39b220777e739d72c9789
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1644788
Commit-Queue: Carlos IL <carlosil@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Henrique Grandinetti <hgrandinetti@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667233}

chrome/browser/about_flags.cc

@@ -2939,12 +2939,6 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kViewsCastDialog)},
 #endif  // defined(TOOLKIT_VIEWS)
 
-    {"SupervisedUserCommittedInterstitials",
-     flag_descriptions::kSupervisedUserCommittedInterstitialsName,
-     flag_descriptions::kSupervisedUserCommittedInterstitialsDescription,
-     kOsAll,
-     FEATURE_VALUE_TYPE(features::kSupervisedUserCommittedInterstitials)},
-
 #if defined(OS_ANDROID)
     {"enable-horizontal-tab-switcher",
      flag_descriptions::kHorizontalTabSwitcherAndroidName,

chrome/browser/download/save_package_file_picker.cc

@@ -128,16 +128,10 @@ void AddCompleteFileTypeInfo(
 // error pages (failed DNS lookups, SSL errors, etc), which shouldn't affect
 // functionality.
 bool IsErrorPage(content::WebContents* web_contents) {
-  if (base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials)) {
-    if (web_contents->GetController().GetActiveEntry() == NULL)
-      return false;
-    return web_contents->GetController()
-               .GetLastCommittedEntry()
-               ->GetPageType() == content::PAGE_TYPE_ERROR;
-  }
-  // Fallback if someone ever disables committed interstitials.
-  return web_contents->ShowingInterstitialPage();
+  if (web_contents->GetController().GetActiveEntry() == NULL)
+    return false;
+  return web_contents->GetController().GetLastCommittedEntry()->GetPageType() ==
+         content::PAGE_TYPE_ERROR;
 }
 
 }  // anonymous namespace

chrome/browser/flag_descriptions.cc

@@ -1657,12 +1657,6 @@ const char kHistoryManipulationInterventionDescription[] =
     "If a page does a client side redirect or adds to the history without a "
     "user gesture, then skip it on back/forward UI.";
 
-const char kSupervisedUserCommittedInterstitialsName[] =
-    "Enable Supervised User Committed Interstitials";
-const char kSupervisedUserCommittedInterstitialsDescription[] =
-    "Use committed error pages instead of transient navigation entries for "
-    "supervised user interstitials";
-
 const char kSilentDebuggerExtensionApiName[] = "Silent Debugging";
 const char kSilentDebuggerExtensionApiDescription[] =
     "Do not show the infobar when an extension attaches to a page via "

chrome/browser/flag_descriptions.h

@@ -981,9 +981,6 @@ extern const char kSkiaRendererDescription[];
 extern const char kHistoryManipulationIntervention[];
 extern const char kHistoryManipulationInterventionDescription[];
 
-extern const char kSupervisedUserCommittedInterstitialsName[];
-extern const char kSupervisedUserCommittedInterstitialsDescription[];
-
 extern const char kEnableDrawOcclusionName[];
 extern const char kEnableDrawOcclusionDescription[];
 

chrome/browser/supervised_user/supervised_user_interstitial.cc

@@ -12,7 +12,6 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/values.h"
@@ -22,7 +21,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
@@ -120,36 +118,16 @@ const content::InterstitialPageDelegate::TypeID
     SupervisedUserInterstitial::kTypeForTesting =
         &SupervisedUserInterstitial::kTypeForTesting;
 
-// TODO(carlosil): Remove Show function and the rest of non-committed
-// interstitials code once committed interstitials are the only code path.
-// static
-void SupervisedUserInterstitial::Show(
-    WebContents* web_contents,
-    const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
-    bool initial_page_load,
-    const base::Callback<void(bool)>& callback) {
-  DCHECK(!base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
-  // |interstitial_page_| is responsible for deleting the interstitial.
-  SupervisedUserInterstitial* interstitial = new SupervisedUserInterstitial(
-      web_contents, url, reason, initial_page_load, callback);
-
-  interstitial->Init();
-}
-
 // static
 std::unique_ptr<SupervisedUserInterstitial> SupervisedUserInterstitial::Create(
     WebContents* web_contents,
     const GURL& url,
     supervised_user_error_page::FilteringBehaviorReason reason,
     bool initial_page_load,
-    const base::Callback<void(bool)>& callback) {
-  DCHECK(base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
+    base::OnceClosure callback) {
   std::unique_ptr<SupervisedUserInterstitial> interstitial(
       new SupervisedUserInterstitial(web_contents, url, reason,
-                                     initial_page_load, callback));
+                                     initial_page_load, std::move(callback)));
 
   // Caller is responsible for deleting the interstitial.
   interstitial->Init();
@@ -162,15 +140,12 @@ SupervisedUserInterstitial::SupervisedUserInterstitial(
     const GURL& url,
     supervised_user_error_page::FilteringBehaviorReason reason,
     bool initial_page_load,
-    const base::Callback<void(bool)>& callback)
+    base::OnceClosure callback)
     : web_contents_(web_contents),
       profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
-      interstitial_page_(NULL),
       url_(url),
       reason_(reason),
-      initial_page_load_(initial_page_load),
-      proceeded_(false),
-      callback_(callback),
+      callback_(std::move(callback)),
       scoped_observer_(this),
       weak_ptr_factory_(this) {}
 
@@ -207,15 +182,6 @@ void SupervisedUserInterstitial::Init() {
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile_);
   scoped_observer_.Add(supervised_user_service);
-
-  if (!base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials)) {
-    // If committed interstitials are enabled we do not create an
-    // interstitial_page
-    interstitial_page_ = content::InterstitialPage::Create(
-        web_contents_, initial_page_load_, url_, this);
-    interstitial_page_->Show();
-  }
 }
 
 // static
@@ -259,12 +225,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
     UMA_HISTOGRAM_ENUMERATION("ManagedMode.BlockingInterstitialCommand",
                               BACK,
                               HISTOGRAM_BOUNDING_VALUE);
-    if (base::FeatureList::IsEnabled(
-            features::kSupervisedUserCommittedInterstitials)) {
-      DontProceedInternal();
-    } else {
-      interstitial_page_->DontProceed();
-    }
+    DontProceedInternal();
     return;
   }
 
@@ -275,9 +236,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
 
     SupervisedUserService* supervised_user_service =
         SupervisedUserServiceFactory::GetForProfile(profile_);
-    supervised_user_service->AddURLAccessRequest(
-        url_, base::Bind(&SupervisedUserInterstitial::OnAccessRequestAdded,
-                         weak_ptr_factory_.GetWeakPtr()));
+    supervised_user_service->AddURLAccessRequest(url_, base::DoNothing());
     return;
   }
 
@@ -335,29 +294,7 @@ SupervisedUserInterstitial::GetTypeForTesting() const {
 
 void SupervisedUserInterstitial::OnURLFilterChanged() {
   if (ShouldProceed()) {
-    if (base::FeatureList::IsEnabled(
-            features::kSupervisedUserCommittedInterstitials)) {
-      ProceedInternal();
-    } else {
-      // Interstitial page deletes the interstitial when proceeding but not
-      // synchronously, so a check is required to avoid calling proceed twice.
-      if (!proceeded_)
-        interstitial_page_->Proceed();
-      proceeded_ = true;
-    }
-  }
-}
-
-void SupervisedUserInterstitial::OnAccessRequestAdded(bool success) {
-  DCHECK(!base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
-  VLOG(1) << "Sent access request for " << url_.spec()
-          << (success ? " successfully" : " unsuccessfully");
-  std::string jsFunc =
-      base::StringPrintf("setRequestStatus(%s);", success ? "true" : "false");
-  if (interstitial_page_->GetMainFrame()) {
-    interstitial_page_->GetMainFrame()->ExecuteJavaScript(
-        base::ASCIIToUTF16(jsFunc), base::NullCallback());
+    ProceedInternal();
   }
 }
 
@@ -382,20 +319,6 @@ void SupervisedUserInterstitial::MoveAwayFromCurrentPage() {
   if (web_contents_->IsBeingDestroyed())
     return;
 
-  // If the interstitial was shown during a page load and there is no history
-  // entry to go back to, attempt to close the tab.
-  // This check is skipped when committed interstitials are on, because all
-  // interstitials are treated as initial page loads in this case, the case
-  // where there is nothing to go back to will be handled by the default case at
-  // the end.
-  if (!base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials) &&
-      initial_page_load_) {
-    if (web_contents_->GetController().IsInitialBlankNavigation())
-      TabCloser::MaybeClose(web_contents_);
-    return;
-  }
-
   // If the interstitial was shown over an existing page, navigate back from
   // that page. If that is not possible, attempt to close the entire tab.
   if (web_contents_->GetController().CanGoBack()) {
@@ -406,9 +329,8 @@ void SupervisedUserInterstitial::MoveAwayFromCurrentPage() {
   TabCloser::MaybeClose(web_contents_);
 }
 
-void SupervisedUserInterstitial::DispatchContinueRequest(
-    bool continue_request) {
-  callback_.Run(continue_request);
+void SupervisedUserInterstitial::OnInterstitialDone() {
+  std::move(callback_).Run();
 
   // After this, the WebContents may be destroyed. Make sure we don't try to use
   // it again.
@@ -416,17 +338,15 @@ void SupervisedUserInterstitial::DispatchContinueRequest(
 }
 
 void SupervisedUserInterstitial::ProceedInternal() {
-  if (base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials) &&
-      web_contents_) {
+  if (web_contents_) {
     // In the committed interstitials case, there will be nothing to resume, so
     // refresh instead.
     web_contents_->GetController().Reload(content::ReloadType::NORMAL, true);
   }
-  DispatchContinueRequest(true);
+  OnInterstitialDone();
 }
 
 void SupervisedUserInterstitial::DontProceedInternal() {
   MoveAwayFromCurrentPage();
-  DispatchContinueRequest(false);
+  OnInterstitialDone();
 }

chrome/browser/supervised_user/supervised_user_interstitial.h

@@ -18,7 +18,6 @@
 #include "url/gurl.h"
 
 namespace content {
-class InterstitialPage;
 class WebContents;
 }
 
@@ -36,18 +35,12 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
   // Interstitial type, used for testing.
   static const content::InterstitialPageDelegate::TypeID kTypeForTesting;
 
-  static void Show(content::WebContents* web_contents,
-                   const GURL& url,
-                   supervised_user_error_page::FilteringBehaviorReason reason,
-                   bool initial_page_load,
-                   const base::Callback<void(bool)>& callback);
-
   static std::unique_ptr<SupervisedUserInterstitial> Create(
       content::WebContents* web_contents,
       const GURL& url,
       supervised_user_error_page::FilteringBehaviorReason reason,
       bool initial_page_load,
-      const base::Callback<void(bool)>& callback);
+      base::OnceClosure callback);
 
   static std::string GetHTMLContents(
       Profile* profile,
@@ -70,7 +63,7 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
       const GURL& url,
       supervised_user_error_page::FilteringBehaviorReason reason,
       bool initial_page_load,
-      const base::Callback<void(bool)>& callback);
+      base::OnceClosure callback);
 
   void Init();
 
@@ -84,8 +77,6 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
   void OnURLFilterChanged() override;
   // TODO(treib): Also listen to OnCustodianInfoChanged and update as required.
 
-  void OnAccessRequestAdded(bool success);
-
   // Returns whether we should now proceed on a previously-blocked URL.
   // Called initially before the interstitial is shown (to catch race
   // conditions), or when the URL filtering prefs change. Note that this does
@@ -97,7 +88,7 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
   // the request.
   void MoveAwayFromCurrentPage();
 
-  void DispatchContinueRequest(bool continue_request);
+  void OnInterstitialDone();
 
   void ProceedInternal();
 
@@ -108,20 +99,10 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
 
   Profile* profile_;
 
-  content::InterstitialPage* interstitial_page_;  // Owns us.
-
   GURL url_;
   supervised_user_error_page::FilteringBehaviorReason reason_;
 
-  // True if the interstitial was shown while loading a page (with a pending
-  // navigation), false if it was shown over an already loaded page.
-  // Interstitials behave very differently in those cases.
-  bool initial_page_load_;
-
-  // True if we have already called Proceed() on the interstitial page.
-  bool proceeded_;
-
-  base::Callback<void(bool)> callback_;
+  base::OnceClosure callback_;
 
   ScopedObserver<SupervisedUserService, SupervisedUserInterstitial>
       scoped_observer_;

chrome/browser/supervised_user/supervised_user_navigation_observer.cc

@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/feature_list.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_interstitial.h"
@@ -14,7 +13,6 @@
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/common/chrome_features.h"
 #include "components/history/content/browser/history_context_helper.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
@@ -66,12 +64,10 @@ void SupervisedUserNavigationObserver::OnRequestBlocked(
 
 void SupervisedUserNavigationObserver::DidFinishNavigation(
       content::NavigationHandle* navigation_handle) {
-  // With committed interstitials on, if this is a different navigation than the
-  // one that triggered the interstitial, clear is_showing_interstitial_
+  // If this is a different navigation than the one that triggered the
+  // interstitial, clear is_showing_interstitial_
   if (is_showing_interstitial_ &&
-      navigation_handle->GetNavigationId() != interstitial_navigation_id_ &&
-      base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials)) {
+      navigation_handle->GetNavigationId() != interstitial_navigation_id_) {
     is_showing_interstitial_ = false;
   }
 
@@ -150,22 +146,8 @@ void SupervisedUserNavigationObserver::URLFilterCheckCallback(
 
   if (!is_showing_interstitial_ &&
       behavior == SupervisedUserURLFilter::FilteringBehavior::BLOCK) {
-    if (base::FeatureList::IsEnabled(
-            features::kSupervisedUserCommittedInterstitials)) {
-      web_contents()->GetController().Reload(content::ReloadType::NORMAL,
-                                             false);
-      return;
-    }
-    // TODO(carlosil): For now, we pass a 0 as the navigation id causing the
-    // interstitial for the non-committed interstitials case since we don't have
-    // the real id here, this doesn't cause issues since the navigation id is
-    // not used when committed interstitials are not enabled. This will be
-    // removed once committed interstitials are the only code path.
-    const bool initial_page_load = false;
-    MaybeShowInterstitial(
-        url, reason, initial_page_load, 0,
-        base::Callback<void(
-            SupervisedUserNavigationThrottle::CallbackActions)>());
+    web_contents()->GetController().Reload(content::ReloadType::NORMAL, false);
+    return;
   }
 }
 
@@ -178,54 +160,30 @@ void SupervisedUserNavigationObserver::MaybeShowInterstitial(
         void(SupervisedUserNavigationThrottle::CallbackActions)>& callback) {
   interstitial_navigation_id_ = navigation_id;
   is_showing_interstitial_ = true;
-  base::Callback<void(bool)> wrapped_callback =
-      base::Bind(&SupervisedUserNavigationObserver::OnInterstitialResult,
-                 weak_ptr_factory_.GetWeakPtr(), callback);
-  if (base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials)) {
-    interstitial_ = SupervisedUserInterstitial::Create(
-        web_contents(), url, reason, initial_page_load, wrapped_callback);
-    callback.Run(SupervisedUserNavigationThrottle::CallbackActions::
-                     kCancelWithInterstitial);
-    return;
-  }
-  SupervisedUserInterstitial::Show(web_contents(), url, reason,
-                                   initial_page_load, wrapped_callback);
+  interstitial_ = SupervisedUserInterstitial::Create(
+      web_contents(), url, reason, initial_page_load,
+      base::BindOnce(&SupervisedUserNavigationObserver::OnInterstitialDone,
+                     weak_ptr_factory_.GetWeakPtr()));
+  callback.Run(SupervisedUserNavigationThrottle::CallbackActions::
+                   kCancelWithInterstitial);
 }
 
-void SupervisedUserNavigationObserver::OnInterstitialResult(
-    const base::Callback<
-        void(SupervisedUserNavigationThrottle::CallbackActions)>& callback,
-    bool result) {
+void SupervisedUserNavigationObserver::OnInterstitialDone() {
   is_showing_interstitial_ = false;
-  // If committed interstitials are enabled, there is no navigation to cancel or
-  // defer at this point, so just clear the is_showing_interstitial variable.
-  if (callback && !base::FeatureList::IsEnabled(
-                      features::kSupervisedUserCommittedInterstitials))
-    callback.Run(result ? SupervisedUserNavigationThrottle::CallbackActions::
-                              kContinueNavigation
-                        : SupervisedUserNavigationThrottle::CallbackActions::
-                              kCancelNavigation);
 }
 
 void SupervisedUserNavigationObserver::GoBack() {
-  DCHECK(base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
   if (interstitial_ && is_showing_interstitial_)
     interstitial_->CommandReceived("\"back\"");
 }
 
 void SupervisedUserNavigationObserver::RequestPermission(
     RequestPermissionCallback callback) {
-  DCHECK(base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
   if (interstitial_ && is_showing_interstitial_)
     interstitial_->RequestPermission(std::move(callback));
 }
 
 void SupervisedUserNavigationObserver::Feedback() {
-  DCHECK(base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials));
   if (interstitial_ && is_showing_interstitial_)
     interstitial_->CommandReceived("\"feedback\"");
 }

chrome/browser/supervised_user/supervised_user_navigation_observer.h

@@ -82,10 +82,7 @@ class SupervisedUserNavigationObserver
       const base::Callback<
           void(SupervisedUserNavigationThrottle::CallbackActions)>& callback);
 
-  void OnInterstitialResult(
-      const base::Callback<
-          void(SupervisedUserNavigationThrottle::CallbackActions)>& callback,
-      bool result);
+  void OnInterstitialDone();
 
   // supervised_user::mojom::SupervisedUserCommands implementation. Should not
   // be called when an interstitial is no longer showing. This should be

chrome/browser/supervised_user/supervised_user_navigation_throttle.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/supervised_user/supervised_user_navigation_throttle.h"
 
 #include "base/bind.h"
-#include "base/feature_list.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ -18,7 +17,6 @@
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
-#include "chrome/common/chrome_features.h"
 #include "content/public/browser/navigation_handle.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
@@ -239,24 +237,16 @@ void SupervisedUserNavigationThrottle::OnCheckDone(
 void SupervisedUserNavigationThrottle::OnInterstitialResult(
     CallbackActions action) {
   switch (action) {
-    case kContinueNavigation: {
-      Resume();
-      break;
-    }
     case kCancelNavigation: {
       CancelDeferredNavigation(CANCEL);
       break;
     }
     case kCancelWithInterstitial: {
-      DCHECK(base::FeatureList::IsEnabled(
-          features::kSupervisedUserCommittedInterstitials));
       std::string interstitial_html =
           SupervisedUserInterstitial::GetHTMLContents(
               Profile::FromBrowserContext(
                   navigation_handle()->GetWebContents()->GetBrowserContext()),
               reason_);
-      // If committed interstitials are enabled, include the HTML content in the
-      // ThrottleCheckResult.
       CancelDeferredNavigation(content::NavigationThrottle::ThrottleCheckResult(
           CANCEL, net::ERR_BLOCKED_BY_CLIENT, interstitial_html));
     }

chrome/browser/supervised_user/supervised_user_navigation_throttle.h

@@ -17,11 +17,7 @@
 
 class SupervisedUserNavigationThrottle : public content::NavigationThrottle {
  public:
-  enum CallbackActions {
-    kContinueNavigation = 0,
-    kCancelNavigation,
-    kCancelWithInterstitial
-  };
+  enum CallbackActions { kCancelNavigation = 0, kCancelWithInterstitial };
 
   // Returns a new throttle for the given navigation, or nullptr if no
   // throttling is required.

chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc

@@ -5,11 +5,9 @@
 #include <memory>
 
 #include "base/command_line.h"
-#include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
@@ -19,7 +17,6 @@
 #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -48,9 +45,7 @@ static const char* kIframeHost2 = "www.iframe2.com";
 
 }  // namespace
 
-class SupervisedUserNavigationThrottleTest
-    : public InProcessBrowserTest,
-      public testing::WithParamInterface<bool> {
+class SupervisedUserNavigationThrottleTest : public InProcessBrowserTest {
  protected:
   SupervisedUserNavigationThrottleTest() {}
   ~SupervisedUserNavigationThrottleTest() override {}
@@ -66,44 +61,24 @@ class SupervisedUserNavigationThrottleTest
         supervised_users::kContentPackManualBehaviorHosts, std::move(dict));
   }
 
-  bool AreCommittedInterstitialsEnabled();
-
   bool IsInterstitialBeingShown(Browser* browser);
 
  private:
   void SetUpOnMainThread() override;
   void SetUpCommandLine(base::CommandLine* command_line) override;
-
-  base::test::ScopedFeatureList feature_list;
 };
 
-bool SupervisedUserNavigationThrottleTest::AreCommittedInterstitialsEnabled() {
-  return base::FeatureList::IsEnabled(
-      features::kSupervisedUserCommittedInterstitials);
-}
-
 bool SupervisedUserNavigationThrottleTest::IsInterstitialBeingShown(
     Browser* browser) {
   WebContents* tab = browser->tab_strip_model()->GetActiveWebContents();
-  if (AreCommittedInterstitialsEnabled()) {
-    base::string16 title;
-    ui_test_utils::GetCurrentTabTitle(browser, &title);
-    return tab->GetController().GetLastCommittedEntry()->GetPageType() ==
-               content::PAGE_TYPE_ERROR &&
-           title == base::ASCIIToUTF16("Site blocked");
-  }
-  return tab->ShowingInterstitialPage();
+  base::string16 title;
+  ui_test_utils::GetCurrentTabTitle(browser, &title);
+  return tab->GetController().GetLastCommittedEntry()->GetPageType() ==
+             content::PAGE_TYPE_ERROR &&
+         title == base::ASCIIToUTF16("Site blocked");
 }
 
 void SupervisedUserNavigationThrottleTest::SetUpOnMainThread() {
-  if (GetParam()) {
-    feature_list.InitAndEnableFeature(
-        features::kSupervisedUserCommittedInterstitials);
-  } else {
-    feature_list.InitAndDisableFeature(
-        features::kSupervisedUserCommittedInterstitials);
-  }
-
   // Resolve everything to localhost.
   host_resolver()->AddIPLiteralRule("*", "127.0.0.1", "localhost");
 
@@ -121,13 +96,9 @@ void SupervisedUserNavigationThrottleTest::SetUpCommandLine(
 #endif
 }
 
-INSTANTIATE_TEST_SUITE_P(,
-                         SupervisedUserNavigationThrottleTest,
-                         ::testing::Values(false, true));
-
 // Tests that navigating to a blocked page simply fails if there is no
 // SupervisedUserNavigationObserver.
-IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleTest,
+IN_PROC_BROWSER_TEST_F(SupervisedUserNavigationThrottleTest,
                        NoNavigationObserverBlock) {
   Profile* profile = browser()->profile();
   SupervisedUserSettingsService* supervised_user_settings_service =
@@ -150,7 +121,7 @@ IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleTest,
   EXPECT_FALSE(observer.last_navigation_succeeded());
 }
 
-IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleTest,
+IN_PROC_BROWSER_TEST_F(SupervisedUserNavigationThrottleTest,
                        BlockMainFrameWithInterstitial) {
   BlockHost(kExampleHost2);
 
@@ -165,7 +136,7 @@ IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleTest,
   EXPECT_TRUE(IsInterstitialBeingShown(browser()));
 }
 
-IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleTest,
+IN_PROC_BROWSER_TEST_F(SupervisedUserNavigationThrottleTest,
                        DontBlockSubFrame) {
   BlockHost(kExampleHost2);
   BlockHost(kIframeHost2);
@@ -199,11 +170,7 @@ class SupervisedUserNavigationThrottleNotSupervisedTest
   void SetUpCommandLine(base::CommandLine* command_line) override {}
 };
 
-INSTANTIATE_TEST_SUITE_P(,
-                         SupervisedUserNavigationThrottleNotSupervisedTest,
-                         ::testing::Values(false, true));
-
-IN_PROC_BROWSER_TEST_P(SupervisedUserNavigationThrottleNotSupervisedTest,
+IN_PROC_BROWSER_TEST_F(SupervisedUserNavigationThrottleNotSupervisedTest,
                        DontBlock) {
   BlockHost(kExampleHost);
 

chrome/common/chrome_features.cc

@@ -618,11 +618,6 @@ const base::Feature kNativeSmb{"NativeSmb", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSoundContentSetting{"SoundContentSetting",
                                          base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables or disabled committed interstitials for Supervised User
-// interstitials.
-const base::Feature kSupervisedUserCommittedInterstitials{
-    "SupervisedUserCommittedInterstitials", base::FEATURE_ENABLED_BY_DEFAULT};
-
 #if defined(OS_CHROMEOS)
 // Enables or disables chrome://sys-internals.
 const base::Feature kSysInternals{"SysInternals",

chrome/common/chrome_features.h

@@ -390,9 +390,6 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kNativeSmb;
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kSoundContentSetting;
 
-COMPONENT_EXPORT(CHROME_FEATURES)
-extern const base::Feature kSupervisedUserCommittedInterstitials;
-
 #if defined(OS_CHROMEOS)
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kSysInternals;