Remove custom namespace supervised_user_error_page.

Moves classes related to the supervised user error page to use the
component namespace supervised_user.

Bug: b/268600855
Change-Id: I3dec7b11866749d2b629b4595809db224989fcfe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4238997
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1104425}

chrome/browser/supervised_user/supervised_user_interstitial.cc

@@ -159,7 +159,7 @@ std::u16string GetActiveUserFirstName() {
 std::unique_ptr<SupervisedUserInterstitial> SupervisedUserInterstitial::Create(
     WebContents* web_contents,
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     int frame_id,
     int64_t interstitial_navigation_id) {
   std::unique_ptr<SupervisedUserInterstitial> interstitial =
@@ -176,7 +176,7 @@ std::unique_ptr<SupervisedUserInterstitial> SupervisedUserInterstitial::Create(
 SupervisedUserInterstitial::SupervisedUserInterstitial(
     WebContents* web_contents,
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     int frame_id,
     int64_t interstitial_navigation_id)
     : web_contents_(web_contents),
@@ -204,7 +204,7 @@ SupervisedUserInterstitial::~SupervisedUserInterstitial() {}
 // static
 std::string SupervisedUserInterstitial::GetHTMLContents(
     Profile* profile,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool already_sent_request,
     bool is_main_frame) {
   SupervisedUserService* supervised_user_service =
@@ -225,7 +225,7 @@ std::string SupervisedUserInterstitial::GetHTMLContents(
   bool allow_access_requests = supervised_user_service->web_approvals_manager()
                                    .AreRemoteApprovalRequestsEnabled();
 
-  return supervised_user_error_page::BuildHtml(
+  return supervised_user::BuildErrorPageHtml(
       allow_access_requests, profile_image_url, profile_image_url2, custodian,
       custodian_email, second_custodian, second_custodian_email, reason,
       g_browser_process->GetApplicationLocale(), already_sent_request,
@@ -280,9 +280,8 @@ void SupervisedUserInterstitial::ShowFeedback() {
   std::string second_custodian =
       supervised_user_service->GetSecondCustodianName();
 
-  std::u16string reason =
-      l10n_util::GetStringUTF16(supervised_user_error_page::GetBlockMessageID(
-          reason_, second_custodian.empty()));
+  std::u16string reason = l10n_util::GetStringUTF16(
+      supervised_user::GetBlockMessageID(reason_, second_custodian.empty()));
   std::string message = l10n_util::GetStringFUTF8(
       IDS_BLOCK_INTERSTITIAL_DEFAULT_FEEDBACK_TEXT, reason);
 #if BUILDFLAG(IS_ANDROID)

chrome/browser/supervised_user/supervised_user_interstitial.h

@@ -76,13 +76,13 @@ class SupervisedUserInterstitial {
   static std::unique_ptr<SupervisedUserInterstitial> Create(
       content::WebContents* web_contents,
       const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason,
+      supervised_user::FilteringBehaviorReason reason,
       int frame_id,
       int64_t interstitial_navigation_id);
 
   static std::string GetHTMLContents(
       Profile* profile,
-      supervised_user_error_page::FilteringBehaviorReason reason,
+      supervised_user::FilteringBehaviorReason reason,
       bool already_sent_request,
       bool is_main_frame);
 
@@ -100,12 +100,11 @@ class SupervisedUserInterstitial {
   const GURL& url() const { return url_; }
 
  private:
-  SupervisedUserInterstitial(
-      content::WebContents* web_contents,
-      const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason,
-      int frame_id,
-      int64_t interstitial_navigation_id);
+  SupervisedUserInterstitial(content::WebContents* web_contents,
+                             const GURL& url,
+                             supervised_user::FilteringBehaviorReason reason,
+                             int frame_id,
+                             int64_t interstitial_navigation_id);
 
   // Tries to go back.
   void AttemptMoveAwayFromCurrentFrameURL();
@@ -121,7 +120,7 @@ class SupervisedUserInterstitial {
 
   // The last committed url for this frame.
   GURL url_;
-  supervised_user_error_page::FilteringBehaviorReason reason_;
+  supervised_user::FilteringBehaviorReason reason_;
 
   // The uniquely identifying global id for the frame.
   int frame_id_;

chrome/browser/supervised_user/supervised_user_navigation_observer.cc

@@ -69,7 +69,7 @@ void SupervisedUserNavigationObserver::BindSupervisedUserCommands(
 void SupervisedUserNavigationObserver::OnRequestBlocked(
     content::WebContents* web_contents,
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     int64_t navigation_id,
     int frame_id,
     const OnInterstitialResultCallback& callback) {
@@ -90,7 +90,7 @@ void SupervisedUserNavigationObserver::OnRequestBlocked(
 
 void SupervisedUserNavigationObserver::UpdateMainFrameFilteringStatus(
     SupervisedUserURLFilter::FilteringBehavior behavior,
-    supervised_user_error_page::FilteringBehaviorReason reason) {
+    supervised_user::FilteringBehaviorReason reason) {
   main_frame_filtering_behavior_ = behavior;
   main_frame_filtering_behavior_reason_ = reason;
 }
@@ -184,7 +184,7 @@ void SupervisedUserNavigationObserver::OnInterstitialDone(int frame_id) {
 
 void SupervisedUserNavigationObserver::OnRequestBlockedInternal(
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     int64_t navigation_id,
     int frame_id,
     const OnInterstitialResultCallback& callback) {
@@ -232,7 +232,7 @@ void SupervisedUserNavigationObserver::URLFilterCheckCallback(
     int render_frame_process_id,
     int render_frame_routing_id,
     SupervisedUserURLFilter::FilteringBehavior behavior,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool uncertain) {
   auto* render_frame_host = content::RenderFrameHost::FromID(
       render_frame_process_id, render_frame_routing_id);
@@ -266,7 +266,7 @@ void SupervisedUserNavigationObserver::URLFilterCheckCallback(
 
 void SupervisedUserNavigationObserver::MaybeShowInterstitial(
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool initial_page_load,
     int64_t navigation_id,
     int frame_id,

chrome/browser/supervised_user/supervised_user_navigation_observer.h

@@ -58,24 +58,23 @@ class SupervisedUserNavigationObserver
       content::RenderFrameHost* rfh);
 
   // Called when a network request to |url| is blocked.
-  static void OnRequestBlocked(
-      content::WebContents* web_contents,
-      const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason,
-      int64_t navigation_id,
-      int frame_id,
-      const OnInterstitialResultCallback& callback);
+  static void OnRequestBlocked(content::WebContents* web_contents,
+                               const GURL& url,
+                               supervised_user::FilteringBehaviorReason reason,
+                               int64_t navigation_id,
+                               int frame_id,
+                               const OnInterstitialResultCallback& callback);
 
   void UpdateMainFrameFilteringStatus(
       SupervisedUserURLFilter::FilteringBehavior behavior,
-      supervised_user_error_page::FilteringBehaviorReason reason);
+      supervised_user::FilteringBehaviorReason reason);
 
   SupervisedUserURLFilter::FilteringBehavior main_frame_filtering_behavior()
       const {
     return main_frame_filtering_behavior_;
   }
 
-  supervised_user_error_page::FilteringBehaviorReason
+  supervised_user::FilteringBehaviorReason
   main_frame_filtering_behavior_reason() const {
     return main_frame_filtering_behavior_reason_;
   }
@@ -108,28 +107,26 @@ class SupervisedUserNavigationObserver
 
   explicit SupervisedUserNavigationObserver(content::WebContents* web_contents);
 
-  void OnRequestBlockedInternal(
-      const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason,
-      int64_t navigation_id,
-      int frame_id,
-      const OnInterstitialResultCallback& callback);
+  void OnRequestBlockedInternal(const GURL& url,
+                                supervised_user::FilteringBehaviorReason reason,
+                                int64_t navigation_id,
+                                int frame_id,
+                                const OnInterstitialResultCallback& callback);
 
   void URLFilterCheckCallback(
       const GURL& url,
       int render_frame_process_id,
       int render_frame_routing_id,
       SupervisedUserURLFilter::FilteringBehavior behavior,
-      supervised_user_error_page::FilteringBehaviorReason reason,
+      supervised_user::FilteringBehaviorReason reason,
       bool uncertain);
 
-  void MaybeShowInterstitial(
-      const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason,
-      bool initial_page_load,
-      int64_t navigation_id,
-      int frame_id,
-      const OnInterstitialResultCallback& callback);
+  void MaybeShowInterstitial(const GURL& url,
+                             supervised_user::FilteringBehaviorReason reason,
+                             bool initial_page_load,
+                             int64_t navigation_id,
+                             int frame_id,
+                             const OnInterstitialResultCallback& callback);
 
   // Filters the RenderFrameHost if render frame is live.
   void FilterRenderFrame(content::RenderFrameHost* render_frame_host);
@@ -167,9 +164,9 @@ class SupervisedUserNavigationObserver
 
   SupervisedUserURLFilter::FilteringBehavior main_frame_filtering_behavior_ =
       SupervisedUserURLFilter::FilteringBehavior::ALLOW;
-  supervised_user_error_page::FilteringBehaviorReason
+  supervised_user::FilteringBehaviorReason
       main_frame_filtering_behavior_reason_ =
-          supervised_user_error_page::FilteringBehaviorReason::DEFAULT;
+          supervised_user::FilteringBehaviorReason::DEFAULT;
 
   std::vector<std::unique_ptr<const sessions::SerializedNavigationEntry>>
       blocked_navigations_;

chrome/browser/supervised_user/supervised_user_navigation_throttle.cc

@@ -53,28 +53,29 @@ static_assert(FILTERING_BEHAVIOR_MAX * kHistogramFilteringBehaviorSpacing +
 
 int GetHistogramValueForFilteringBehavior(
     SupervisedUserURLFilter::FilteringBehavior behavior,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool uncertain) {
   switch (behavior) {
     case SupervisedUserURLFilter::ALLOW:
-      if (reason == supervised_user_error_page::ALLOWLIST)
+      if (reason == supervised_user::FilteringBehaviorReason::ALLOWLIST) {
         return FILTERING_BEHAVIOR_ALLOW_ALLOWLIST;
+      }
       return uncertain ? FILTERING_BEHAVIOR_ALLOW_UNCERTAIN
                        : FILTERING_BEHAVIOR_ALLOW;
     case SupervisedUserURLFilter::BLOCK:
       switch (reason) {
-        case supervised_user_error_page::DENYLIST:
+        case supervised_user::FilteringBehaviorReason::DENYLIST:
           return FILTERING_BEHAVIOR_BLOCK_DENYLIST;
-        case supervised_user_error_page::ASYNC_CHECKER:
+        case supervised_user::FilteringBehaviorReason::ASYNC_CHECKER:
           return FILTERING_BEHAVIOR_BLOCK_SAFESITES;
-        case supervised_user_error_page::ALLOWLIST:
+        case supervised_user::FilteringBehaviorReason::ALLOWLIST:
           NOTREACHED();
           break;
-        case supervised_user_error_page::MANUAL:
+        case supervised_user::FilteringBehaviorReason::MANUAL:
           return FILTERING_BEHAVIOR_BLOCK_MANUAL;
-        case supervised_user_error_page::DEFAULT:
+        case supervised_user::FilteringBehaviorReason::DEFAULT:
           return FILTERING_BEHAVIOR_BLOCK_DEFAULT;
-        case supervised_user_error_page::NOT_SIGNED_IN:
+        case supervised_user::FilteringBehaviorReason::NOT_SIGNED_IN:
           // Should never happen, only used for requests from Webview
           NOTREACHED();
       }
@@ -97,7 +98,7 @@ int GetHistogramValueForTransitionType(ui::PageTransition transition_type) {
 void RecordFilterResultEvent(
     bool safesites_histogram,
     SupervisedUserURLFilter::FilteringBehavior behavior,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool uncertain,
     ui::PageTransition transition_type) {
   int value =
@@ -190,7 +191,7 @@ SupervisedUserNavigationThrottle::CheckURL() {
 
 void SupervisedUserNavigationThrottle::ShowInterstitial(
     const GURL& url,
-    supervised_user_error_page::FilteringBehaviorReason reason) {
+    supervised_user::FilteringBehaviorReason reason) {
   // Don't show interstitial synchronously - it doesn't seem like a good idea to
   // show an interstitial right in the middle of a call into a
   // NavigationThrottle. This also lets OnInterstitialResult to be invoked
@@ -203,7 +204,7 @@ void SupervisedUserNavigationThrottle::ShowInterstitial(
 }
 
 void SupervisedUserNavigationThrottle::ShowInterstitialAsync(
-    supervised_user_error_page::FilteringBehaviorReason reason) {
+    supervised_user::FilteringBehaviorReason reason) {
   // May not yet have been set when ShowInterstitial was called, but should have
   // been set by the time this is invoked.
   DCHECK(deferred_);
@@ -233,7 +234,7 @@ const char* SupervisedUserNavigationThrottle::GetNameForLogging() {
 void SupervisedUserNavigationThrottle::OnCheckDone(
     const GURL& url,
     SupervisedUserURLFilter::FilteringBehavior behavior,
-    supervised_user_error_page::FilteringBehaviorReason reason,
+    supervised_user::FilteringBehaviorReason reason,
     bool uncertain) {
   DCHECK_EQ(SupervisedUserURLFilter::INVALID, behavior_);
 
@@ -250,8 +251,8 @@ void SupervisedUserNavigationThrottle::OnCheckDone(
   // If both the static denylist and the async checker are enabled, also record
   // SafeSites-only UMA events.
   if (url_filter_->HasDenylist() && url_filter_->HasAsyncURLChecker() &&
-      (reason == supervised_user_error_page::ASYNC_CHECKER ||
-       reason == supervised_user_error_page::DENYLIST)) {
+      (reason == supervised_user::FilteringBehaviorReason::ASYNC_CHECKER ||
+       reason == supervised_user::FilteringBehaviorReason::DENYLIST)) {
     RecordFilterResultEvent(true, behavior, reason, uncertain, transition);
   }
 

chrome/browser/supervised_user/supervised_user_navigation_throttle.h

@@ -44,16 +44,14 @@ class SupervisedUserNavigationThrottle : public content::NavigationThrottle {
   // URL.
   ThrottleCheckResult CheckURL();
 
-  void ShowInterstitial(
-      const GURL& url,
-      supervised_user_error_page::FilteringBehaviorReason reason);
+  void ShowInterstitial(const GURL& url,
+                        supervised_user::FilteringBehaviorReason reason);
 
-  void ShowInterstitialAsync(
-      supervised_user_error_page::FilteringBehaviorReason reason);
+  void ShowInterstitialAsync(supervised_user::FilteringBehaviorReason reason);
 
   void OnCheckDone(const GURL& url,
                    SupervisedUserURLFilter::FilteringBehavior behavior,
-                   supervised_user_error_page::FilteringBehaviorReason reason,
+                   supervised_user::FilteringBehaviorReason reason,
                    bool uncertain);
 
   void OnInterstitialResult(CallbackActions continue_request,
@@ -62,7 +60,7 @@ class SupervisedUserNavigationThrottle : public content::NavigationThrottle {
 
   raw_ptr<const SupervisedUserURLFilter> url_filter_;
   bool deferred_;
-  supervised_user_error_page::FilteringBehaviorReason reason_;
+  supervised_user::FilteringBehaviorReason reason_;
   SupervisedUserURLFilter::FilteringBehavior behavior_;
   base::WeakPtrFactory<SupervisedUserNavigationThrottle> weak_ptr_factory_{
       this};