Move the supervised user error page to a component

chrome/browser/supervised_user/supervised_user_interstitial.h

Index: chrome/browser/supervised_user/supervised_user_interstitial.h
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.h b/chrome/browser/supervised_user/supervised_user_interstitial.h
index f90bf1e67ddabbb228a49da6a90485374399bbf4..3a8165df9dadb4ee314276ca9189768dbf75c6af 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.h
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
+#include "components/supervised_user_error_page/supervised_user_error_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "url/gurl.h"
 
@@ -33,18 +34,18 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
 
   static void Show(content::WebContents* web_contents,
                    const GURL& url,
-                   SupervisedUserURLFilter::FilteringBehaviorReason reason,
+                   supervised_user_error_page::FilteringBehaviorReason reason,
                    const base::Callback<void(bool)>& callback);
 
   static std::string GetHTMLContents(
       Profile* profile,
-      SupervisedUserURLFilter::FilteringBehaviorReason reason);
+      supervised_user_error_page::FilteringBehaviorReason reason);
 
  private:
   SupervisedUserInterstitial(
       content::WebContents* web_contents,
       const GURL& url,
-      SupervisedUserURLFilter::FilteringBehaviorReason reason,
+      supervised_user_error_page::FilteringBehaviorReason reason,
       const base::Callback<void(bool)>& callback);
   ~SupervisedUserInterstitial() override;
 
@@ -72,6 +73,16 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
 
   void DispatchContinueRequest(bool continue_request);
 
+  static std::string BuildHtml(
+      bool allow_access_requests,
+      const std::string& profile_image_url,
+      const std::string& profile_image_url2,
+      const base::string16& custodian,
+      const base::string16& custodian_email,
+      const base::string16& second_custodian,
+      const base::string16& second_custodian_email,
+      bool is_child_account,
+      supervised_user_error_page::FilteringBehaviorReason reason);

[Bernhard Bauer, 2016/03/16 13:59:45]

Add an empty line before comments please.

But actually, this method doesn't seem to be implemented?

[aberent, 2016/03/16 16:06:40]

Removed. Forgot to clean up an intermediate stage in my refactoring.

   // Owns the interstitial, which owns us.

[Bernhard Bauer, 2016/03/16 13:59:45]

Add an empty line before comments please.

[aberent, 2016/03/16 16:06:40]

Done.

   content::WebContents* web_contents_;
 
@@ -80,7 +91,7 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
   content::InterstitialPage* interstitial_page_;  // Owns us.
 
   GURL url_;
-  SupervisedUserURLFilter::FilteringBehaviorReason reason_;
+  supervised_user_error_page::FilteringBehaviorReason reason_;
 
   base::Callback<void(bool)> callback_;