1 files changed, 28 insertions, 20 deletions

diff --git a/chromium/chrome/browser/ui/webui/management_ui_handler.cc b/chromium/chrome/browser/ui/webui/management_ui_handler.cc
index 6b9e20b4ac9..6442a49973f 100644
--- a/chromium/chrome/browser/ui/webui/management_ui_handler.cc
+++ b/chromium/chrome/browser/ui/webui/management_ui_handler.cc
@@ -203,7 +203,7 @@ void AddDeviceReportingElement(base::Value* report_sources,
   base::Value data(base::Value::Type::DICTIONARY);
   data.SetKey("messageId", base::Value(message_id));
   data.SetKey("reportingType", base::Value(ToJSDeviceReportingType(type)));
-  report_sources->GetList().push_back(std::move(data));
+  report_sources->Append(std::move(data));
 }
 
 void AddDeviceReportingInfo(base::Value* report_sources, Profile* profile) {
@@ -297,7 +297,7 @@ base::Value GetPowerfulExtensions(const extensions::ExtensionSet& extensions) {
           extensions::util::GetExtensionInfo(extension.get());
       extension_to_add->SetKey("permissions",
                                base::Value(std::move(permission_messages)));
-      powerful_extensions.GetList().push_back(std::move(*extension_to_add));
+      powerful_extensions.Append(std::move(*extension_to_add));
     }
   }
 
@@ -336,11 +336,8 @@ std::string ManagementUIHandler::GetAccountDomain(Profile* profile) {
 
   const std::string domain = gaia::ExtractDomainName(std::move(username));
 
-  auto consumer_domain_pos = domain.find("gmail.com");
-  if (consumer_domain_pos == std::string::npos)
-    consumer_domain_pos = domain.find("googlemail.com");
-
-  return consumer_domain_pos == std::string::npos ? domain : std::string();
+  return (domain == "gmail.com" || domain == "googlemail.com") ? std::string()
+                                                               : domain;
 }
 
 ManagementUIHandler::ManagementUIHandler() {
@@ -410,8 +407,7 @@ void ManagementUIHandler::OnJavascriptDisallowed() {
   RemoveObservers();
 }
 
-void ManagementUIHandler::AddExtensionReportingInfo(
-    base::Value* report_sources) {
+void ManagementUIHandler::AddReportingInfo(base::Value* report_sources) {
   const extensions::Extension* cloud_reporting_extension =
       GetEnabledExtension(kCloudReportingExtensionId);
 
@@ -439,6 +435,15 @@ void ManagementUIHandler::AddExtensionReportingInfo(
 
   const bool cloud_reporting_extension_installed =
       cloud_reporting_extension != nullptr;
+  const auto* cloud_reporting_policy_value =
+      GetPolicyService()
+          ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
+                                                std::string()))
+          .GetValue(policy::key::kCloudReportingEnabled);
+  const bool cloud_reporting_policy_enabled =
+      cloud_reporting_policy_value && cloud_reporting_policy_value->is_bool() &&
+      cloud_reporting_policy_value->GetBool();
+
   const struct {
     const char* policy_key;
     const char* message;
@@ -446,22 +451,25 @@ void ManagementUIHandler::AddExtensionReportingInfo(
     const bool enabled_by_default;
   } report_definitions[] = {
       {kPolicyKeyReportMachineIdData, kManagementExtensionReportMachineName,
-       ReportingType::kDevice, cloud_reporting_extension_installed},
+       ReportingType::kDevice,
+       cloud_reporting_extension_installed || cloud_reporting_policy_enabled},
       {kPolicyKeyReportMachineIdData,
        kManagementExtensionReportMachineNameAddress, ReportingType::kDevice,
        false},
       {kPolicyKeyReportVersionData, kManagementExtensionReportVersion,
-       ReportingType::kDevice, cloud_reporting_extension_installed},
+       ReportingType::kDevice,
+       cloud_reporting_extension_installed || cloud_reporting_policy_enabled},
       {kPolicyKeyReportSystemTelemetryData, kManagementExtensionReportPerfCrash,
        ReportingType::kDevice, false},
       {kPolicyKeyReportUserIdData, kManagementExtensionReportUsername,
-       ReportingType::kUser, cloud_reporting_extension_installed},
+       ReportingType::kUser,
+       cloud_reporting_extension_installed || cloud_reporting_policy_enabled},
       {kPolicyKeyReportSafeBrowsingData,
        kManagementExtensionReportSafeBrowsingWarnings, ReportingType::kSecurity,
        cloud_reporting_extension_installed},
       {kPolicyKeyReportExtensionsData,
        kManagementExtensionReportExtensionsPlugin, ReportingType::kExtensions,
-       cloud_reporting_extension_installed},
+       cloud_reporting_extension_installed || cloud_reporting_policy_enabled},
       {kPolicyKeyReportUserBrowsingData,
        kManagementExtensionReportUserBrowsingData, ReportingType::kUserActivity,
        false},
@@ -503,7 +511,7 @@ void ManagementUIHandler::AddExtensionReportingInfo(
     data.SetKey(
         "reportingType",
         base::Value(GetReportingTypeValue(report_definition.reporting_type)));
-    report_sources->GetList().push_back(std::move(data));
+    report_sources->Append(std::move(data));
   }
 }
 
@@ -597,7 +605,7 @@ base::Value ManagementUIHandler::GetThreatProtectionInfo(
     base::Value value(base::Value::Type::DICTIONARY);
     value.SetStringKey("title", kManagementDataLossPreventionName);
     value.SetStringKey("permission", kManagementDataLossPreventionPermissions);
-    info.GetList().push_back(std::move(value));
+    info.Append(std::move(value));
   }
 
   // SendFilesForMalwareCheck is a int-enum policy. The accepted values are
@@ -606,13 +614,13 @@ base::Value ManagementUIHandler::GetThreatProtectionInfo(
       chrome_policies.GetValue(policy::key::kSendFilesForMalwareCheck);
   if (send_files_for_malware_check_value &&
       send_files_for_malware_check_value->GetInt() >
-          safe_browsing::SEND_FILES_DISABLED &&
+          safe_browsing::DO_NOT_SCAN &&
       send_files_for_malware_check_value->GetInt() <=
           safe_browsing::SEND_FILES_FOR_MALWARE_CHECK_MAX) {
     base::Value value(base::Value::Type::DICTIONARY);
     value.SetStringKey("title", kManagementMalwareScanningName);
     value.SetStringKey("permission", kManagementMalwareScanningPermissions);
-    info.GetList().push_back(std::move(value));
+    info.Append(std::move(value));
   }
 
   auto* unsafe_event_reporting_value =
@@ -621,7 +629,7 @@ base::Value ManagementUIHandler::GetThreatProtectionInfo(
     base::Value value(base::Value::Type::DICTIONARY);
     value.SetStringKey("title", kManagementEnterpriseReportingName);
     value.SetStringKey("permission", kManagementEnterpriseReportingPermissions);
-    info.GetList().push_back(std::move(value));
+    info.Append(std::move(value));
   }
 
 #if defined(OS_CHROMEOS)
@@ -825,14 +833,14 @@ void ManagementUIHandler::HandleInitBrowserReportingInfo(
     const base::ListValue* args) {
   base::Value report_sources(base::Value::Type::LIST);
   AllowJavascript();
-  AddExtensionReportingInfo(&report_sources);
+  AddReportingInfo(&report_sources);
   ResolveJavascriptCallback(args->GetList()[0] /* callback_id */,
                             report_sources);
 }
 
 void ManagementUIHandler::NotifyBrowserReportingInfoUpdated() {
   base::Value report_sources(base::Value::Type::LIST);
-  AddExtensionReportingInfo(&report_sources);
+  AddReportingInfo(&report_sources);
   FireWebUIListener("browser-reporting-info-updated", report_sources);
 }