Extract conditions to include users' email in activity reporting into a method.

It makes it clear that including users' emails in activity report is a diffrent thing
than reporting list of device users.

Follow up for: https://chromium-review.googlesource.com/c/chromium/src/+/1034120

Test: Run DeviceStatusCollectorTest and ConsumerDeviceCollectorTest
Change-Id: I7b749c5abefb3a892aeb21113647a75feeae1255
Reviewed-on: https://chromium-review.googlesource.com/1080171Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564733}

chrome/browser/chromeos/policy/device_status_collector.cc

@@ -1047,6 +1047,13 @@ std::string DeviceStatusCollector::GetUserForActivityReporting() const {
   return primary_user_email;
 }
 
+bool DeviceStatusCollector::IncludeEmailsInActivityReports() const {
+  // In enterprise reporting including users' emails depends on
+  // kReportDeviceUsers preference. In consumer reporting only current user is
+  // reported and email address is always included.
+  return !is_enterprise_reporting_ || report_users_;
+}
+
 void DeviceStatusCollector::OnPrefServiceInitialized(bool succeeded) {
   if (!succeeded) {
     LOG(ERROR) << "Pref service was not initialized successfully - activity "
@@ -1069,8 +1076,8 @@ bool DeviceStatusCollector::GetActivityTimes(
   // If user reporting is off, data should be aggregated per day.
   // Signed-in user is reported in non-enterprise reporting.
   std::vector<ActivityStorage::ActivityPeriod> activity_times =
-      activity_storage_->GetFilteredActivityPeriods(is_enterprise_reporting_ &&
-                                                    !report_users_);
+      activity_storage_->GetFilteredActivityPeriods(
+          !IncludeEmailsInActivityReports());
 
   bool anything_reported = false;
   for (const auto& activity_period : activity_times) {

chrome/browser/chromeos/policy/device_status_collector.h

@@ -217,6 +217,10 @@ class DeviceStatusCollector {
   // single session, even for multi-user sessions.
   std::string GetUserForActivityReporting() const;
 
+  // Returns whether users' email addresses should be included in activity
+  // reports.
+  bool IncludeEmailsInActivityReports() const;
+
   // Called when |pref_service_| is initialized.
   void OnPrefServiceInitialized(bool succeeded);