Revert of Supervised user web restrictions content provider

chrome/browser/supervised_user/supervised_user_interstitial.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/supervised_user_interstitial.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 177 matching lines @@
       SupervisedUserServiceFactory::GetForProfile(profile_);
   supervised_user_service->AddObserver(this);
 
   interstitial_page_ =
       content::InterstitialPage::Create(web_contents_, true, url_, this);
   interstitial_page_->Show();
 
   return true;
 }
 
-// static
-std::string SupervisedUserInterstitial::GetHTMLContents(
-    Profile* profile,
-    SupervisedUserURLFilter::FilteringBehaviorReason reason) {
+std::string SupervisedUserInterstitial::GetHTMLContents() {
   base::DictionaryValue strings;
   strings.SetString("blockPageTitle",
                     l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_TITLE));
 
   SupervisedUserService* supervised_user_service =
-      SupervisedUserServiceFactory::GetForProfile(profile);
+      SupervisedUserServiceFactory::GetForProfile(profile_);
 
   bool allow_access_requests = supervised_user_service->AccessRequestsEnabled();
   strings.SetBoolean("allowAccessRequests", allow_access_requests);
 
-  std::string profile_image_url = profile->GetPrefs()->GetString(
+  std::string profile_image_url = profile_->GetPrefs()->GetString(
       prefs::kSupervisedUserCustodianProfileImageURL);
   strings.SetString("avatarURL1x", BuildAvatarImageUrl(profile_image_url,
                                                        kAvatarSize1x));
   strings.SetString("avatarURL2x", BuildAvatarImageUrl(profile_image_url,
                                                        kAvatarSize2x));
 
-  std::string profile_image_url2 = profile->GetPrefs()->GetString(
+  std::string profile_image_url2 = profile_->GetPrefs()->GetString(
       prefs::kSupervisedUserSecondCustodianProfileImageURL);
   strings.SetString("secondAvatarURL1x", BuildAvatarImageUrl(profile_image_url2,
                                                              kAvatarSize1x));
   strings.SetString("secondAvatarURL2x", BuildAvatarImageUrl(profile_image_url2,
                                                              kAvatarSize2x));
 
-  bool is_child_account = profile->IsChild();
+  bool is_child_account = profile_->IsChild();
 
   base::string16 custodian =
       base::UTF8ToUTF16(supervised_user_service->GetCustodianName());
   base::string16 second_custodian =
       base::UTF8ToUTF16(supervised_user_service->GetSecondCustodianName());
 
   base::string16 block_message;
   if (allow_access_requests) {
     if (is_child_account) {
       block_message = l10n_util::GetStringUTF16(
           second_custodian.empty()
               ? IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT
               : IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT);
     } else {
       block_message = l10n_util::GetStringFUTF16(
           IDS_BLOCK_INTERSTITIAL_MESSAGE, custodian);
     }
   } else {
     block_message = l10n_util::GetStringUTF16(
         IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED);
   }
   strings.SetString("blockPageMessage", block_message);
-  strings.SetString(
-      "blockReasonMessage",
-      is_child_account ? l10n_util::GetStringUTF16(
-                             SupervisedUserURLFilter::GetBlockMessageID(reason))
-                       : base::string16());
+  strings.SetString("blockReasonMessage", is_child_account
+      ? l10n_util::GetStringUTF16(
+            SupervisedUserURLFilter::GetBlockMessageID(reason_))
+      : base::string16());
 
   bool show_feedback = false;
 #if defined(GOOGLE_CHROME_BUILD)
-  show_feedback =
-      is_child_account && SupervisedUserURLFilter::ReasonIsAutomatic(reason);
+  show_feedback = is_child_account &&
+                  SupervisedUserURLFilter::ReasonIsAutomatic(reason_);
 #endif
   strings.SetBoolean("showFeedbackLink", show_feedback);
   strings.SetString("feedbackLink",
       l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK));
 
   strings.SetString("backButton", l10n_util::GetStringUTF16(IDS_BACK_BUTTON));
   strings.SetString("requestAccessButton", l10n_util::GetStringUTF16(
       is_child_account
           ? IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON
           : IDS_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON));
@@ skipping 26 matching lines @@
 
   std::string html =
       ResourceBundle::GetSharedInstance()
           .GetRawDataResource(IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML)
           .as_string();
   webui::AppendWebUiCssTextDefaults(&html);
 
   return webui::GetI18nTemplateHtml(html, &strings);
 }
 
-std::string SupervisedUserInterstitial::GetHTMLContents() {
-  return GetHTMLContents(profile_, reason_);
-}
-
 void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
   // For use in histograms.
   enum Commands {
     PREVIEW,
     BACK,
     NTP,
     ACCESS_REQUEST,
     HISTOGRAM_BOUNDING_VALUE
   };
 
@@ skipping 91 matching lines @@
   supervised_user_service->RemoveObserver(this);
 
   if (!callback_.is_null())
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(callback_, continue_request));
 
   // After this, the WebContents may be destroyed. Make sure we don't try to use
   // it again.
   web_contents_ = NULL;
 }