Update supervised user interstitial pages.

components/supervised_user_error_page/supervised_user_error_page_unittest.cc

 // Copyright 2016 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 "components/supervised_user_error_page/supervised_user_error_page.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/grit/components_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 22 matching lines @@
       << "reason = " << param.reason
       << " is_child_account = " << param.is_child_account
       << " single parent = " << param.single_parent;
 }
 
 BlockMessageIDTestParameter block_message_id_test_params[] = {
     {DEFAULT, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT},
     {DEFAULT, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT},
     {DEFAULT, true, true, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_SINGLE_PARENT},
     {DEFAULT, true, false, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_MULTI_PARENT},
-    {ASYNC_CHECKER, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
-    {ASYNC_CHECKER, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
+    // SafeSites is not enabled for supervised users.
     {ASYNC_CHECKER, true, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
     {ASYNC_CHECKER, true, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
     {MANUAL, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_MANUAL},
     {MANUAL, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_MANUAL},
     {MANUAL, true, true, IDS_CHILD_BLOCK_MESSAGE_MANUAL_SINGLE_PARENT},
     {MANUAL, true, false, IDS_CHILD_BLOCK_MESSAGE_MANUAL_MULTI_PARENT},
 };
 
 INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized,
                         SupervisedUserErrorPageTest_GetBlockMessageID,
@@ skipping 31 matching lines @@
           .as_string();
   EXPECT_THAT(result, testing::HasSubstr(html));
   EXPECT_THAT(result, testing::HasSubstr(param.profile_image_url));
   EXPECT_THAT(result, testing::HasSubstr(param.profile_image_url2));
   EXPECT_THAT(result, testing::HasSubstr(param.custodian));
   EXPECT_THAT(result, testing::HasSubstr(param.custodian_email));
   if (param.has_two_parents) {
     EXPECT_THAT(result, testing::HasSubstr(param.second_custodian));
     EXPECT_THAT(result, testing::HasSubstr(param.second_custodian_email));
   }
-#if defined(GOOGLE_CHROME_BUILD)
-  if (param.is_child_account &&
-      (param.reason == ASYNC_CHECKER || param.reason == BLACKLIST))
+  if (param.reason == ASYNC_CHECKER || param.reason == BLACKLIST) {
     EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":true"));
-  else
-#endif
+  } else {
     EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":false"));
+  }
+
   // Messages containing parameters aren't tested since they get modified before
   // they are added to the result.
   if (param.allow_access_requests) {
     if (param.is_child_account) {
       EXPECT_THAT(result, testing::HasSubstr(l10n_util::GetStringUTF8(
                               IDS_CHILD_BLOCK_INTERSTITIAL_HEADER)));
       EXPECT_THAT(result, testing::HasSubstr(l10n_util::GetStringUTF8(
                               IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE)));
       EXPECT_THAT(
           result,
@@ skipping 81 matching lines @@
 BuildHtmlTestParameter build_html_test_parameter[] = {
     {true, "url1", "url2", "custodian", "custodian_email", "", "", true,
      DEFAULT, false},
     {true, "url1", "url2", "custodian", "custodian_email", "custodian2",
      "custodian2_email", true, DEFAULT, true},
     {false, "url1", "url2", "custodian", "custodian_email", "custodian2",
      "custodian2_email", true, DEFAULT, true},
     {true, "url1", "url2", "custodian", "custodian_email", "custodian2",
      "custodian2_email", false, DEFAULT, true},
     {true, "url1", "url2", "custodian", "custodian_email", "custodian2",
-     "custodian2_email", false, ASYNC_CHECKER, true},
+     "custodian2_email", true, ASYNC_CHECKER, true},
 };
 
 INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized,
                         SupervisedUserErrorPageTest_BuildHtml,
                         ::testing::ValuesIn(build_html_test_parameter));
 
 }  //  namespace supervised_user_error_page