Rename ConsumerStatusRepotingService

Status reporting refactoring that landed recently makes it only relevant
for child users. Rename to ChildStatusReportingService to reflect that.

Bug: 1022231
Change-Id: I6a6763fc977eaf572bee9ec27eb90b76030c75a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910700Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714615}

chrome/browser/chromeos/BUILD.gn

@@ -753,10 +753,10 @@ source_set("chromeos") {
     "certificate_provider/thread_safe_certificate_map.h",
     "child_accounts/child_policy_observer.cc",
     "child_accounts/child_policy_observer.h",
-    "child_accounts/consumer_status_reporting_service.cc",
-    "child_accounts/consumer_status_reporting_service.h",
-    "child_accounts/consumer_status_reporting_service_factory.cc",
-    "child_accounts/consumer_status_reporting_service_factory.h",
+    "child_accounts/child_status_reporting_service.cc",
+    "child_accounts/child_status_reporting_service.h",
+    "child_accounts/child_status_reporting_service_factory.cc",
+    "child_accounts/child_status_reporting_service_factory.h",
     "child_accounts/event_based_status_reporting_service.cc",
     "child_accounts/event_based_status_reporting_service.h",
     "child_accounts/event_based_status_reporting_service_factory.cc",

chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.cc → chrome/browser/chromeos/child_accounts/child_status_reporting_service.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -32,7 +32,7 @@ constexpr base::TimeDelta kStatusUploadFrequency =
 
 }  // namespace
 
-ConsumerStatusReportingService::ConsumerStatusReportingService(
+ChildStatusReportingService::ChildStatusReportingService(
     content::BrowserContext* context)
     : context_(context) {
   Profile* profile = Profile::FromBrowserContext(context_);
@@ -56,7 +56,7 @@ ConsumerStatusReportingService::ConsumerStatusReportingService(
   pref_change_registrar_->Add(
       prefs::kUsageTimeLimit,
       base::BindRepeating(
-          &ConsumerStatusReportingService::OnTimeLimitsPolicyChanged,
+          &ChildStatusReportingService::OnTimeLimitsPolicyChanged,
           base::Unretained(this)));
 
   CreateStatusUploaderIfNeeded(user_cloud_policy_manager_->core()->client());
@@ -66,9 +66,9 @@ ConsumerStatusReportingService::ConsumerStatusReportingService(
   }
 }
 
-ConsumerStatusReportingService::~ConsumerStatusReportingService() = default;
+ChildStatusReportingService::~ChildStatusReportingService() = default;
 
-void ConsumerStatusReportingService::CreateStatusUploaderIfNeeded(
+void ChildStatusReportingService::CreateStatusUploaderIfNeeded(
     policy::CloudPolicyClient* client) {
   const base::DictionaryValue* time_limit =
       pref_change_registrar_->prefs()->GetDictionary(prefs::kUsageTimeLimit);
@@ -80,7 +80,7 @@ void ConsumerStatusReportingService::CreateStatusUploaderIfNeeded(
   if (status_uploader_ && (day_reset_time_ == new_day_reset_time))
     return;
 
-  VLOG(1) << "Creating status uploader for consumer status reporting.";
+  VLOG(1) << "Creating status uploader for child status reporting.";
   day_reset_time_ = new_day_reset_time;
   status_uploader_ = std::make_unique<policy::StatusUploader>(
       client,
@@ -92,11 +92,11 @@ void ConsumerStatusReportingService::CreateStatusUploaderIfNeeded(
       base::ThreadTaskRunnerHandle::Get(), kStatusUploadFrequency);
 }
 
-bool ConsumerStatusReportingService::RequestImmediateStatusReport() {
+bool ChildStatusReportingService::RequestImmediateStatusReport() {
   return status_uploader_->ScheduleNextStatusUploadImmediately();
 }
 
-base::TimeDelta ConsumerStatusReportingService::GetChildScreenTime() const {
+base::TimeDelta ChildStatusReportingService::GetChildScreenTime() const {
   // Notice that this cast works because we know that |status_uploader_| has a
   // ChildStatusCollector (see above).
   return static_cast<policy::ChildStatusCollector*>(
@@ -104,7 +104,7 @@ base::TimeDelta ConsumerStatusReportingService::GetChildScreenTime() const {
       ->GetActiveChildScreenTime();
 }
 
-void ConsumerStatusReportingService::OnTimeLimitsPolicyChanged() {
+void ChildStatusReportingService::OnTimeLimitsPolicyChanged() {
   CreateStatusUploaderIfNeeded(user_cloud_policy_manager_->core()->client());
 }
 

chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h → chrome/browser/chromeos/child_accounts/child_status_reporting_service.h

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_H_
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
 
@@ -21,19 +20,22 @@ namespace policy {
 class CloudPolicyClient;
 class StatusUploader;
 class UserCloudPolicyManagerChromeOS;
-}
+}  // namespace policy
 
 namespace chromeos {
 
-// Controls consumer reporting for child user.
+// Controls reporting for child user.
 // Child user should be registered with DMServer and periodically upload the
 // information about the device usage. The reports are only sent during user's
 // session and they do not interfere with enterprise reporting that is
 // controlled by DeviceCloudPolicyManagerChromeOS.
-class ConsumerStatusReportingService : public KeyedService {
+class ChildStatusReportingService : public KeyedService {
  public:
-  explicit ConsumerStatusReportingService(content::BrowserContext* context);
-  ~ConsumerStatusReportingService() override;
+  explicit ChildStatusReportingService(content::BrowserContext* context);
+  ChildStatusReportingService(const ChildStatusReportingService&) = delete;
+  ChildStatusReportingService& operator=(const ChildStatusReportingService&) =
+      delete;
+  ~ChildStatusReportingService() override;
 
   // Returns true if the status report has been scheduled. Otherwise, returns
   // false.
@@ -56,17 +58,15 @@ class ConsumerStatusReportingService : public KeyedService {
   // Preference changes observer.
   std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
 
-  // Day start/reset time used for aggregating activity data for consumer status
+  // Day start/reset time used for aggregating activity data for child status
   // reporting.
   base::TimeDelta day_reset_time_;
 
   content::BrowserContext* const context_;
 
   policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(ConsumerStatusReportingService);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_H_

chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.cc → chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.cc

@@ -2,41 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 namespace chromeos {
 
 // static
-ConsumerStatusReportingService*
-ConsumerStatusReportingServiceFactory::GetForBrowserContext(
+ChildStatusReportingService*
+ChildStatusReportingServiceFactory::GetForBrowserContext(
     content::BrowserContext* context) {
-  return static_cast<ConsumerStatusReportingService*>(
+  return static_cast<ChildStatusReportingService*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
-ConsumerStatusReportingServiceFactory*
-ConsumerStatusReportingServiceFactory::GetInstance() {
-  static base::NoDestructor<ConsumerStatusReportingServiceFactory> factory;
+ChildStatusReportingServiceFactory*
+ChildStatusReportingServiceFactory::GetInstance() {
+  static base::NoDestructor<ChildStatusReportingServiceFactory> factory;
   return factory.get();
 }
 
-ConsumerStatusReportingServiceFactory::ConsumerStatusReportingServiceFactory()
+ChildStatusReportingServiceFactory::ChildStatusReportingServiceFactory()
     : BrowserContextKeyedServiceFactory(
-          "ConsumerStatusReportingServiceFactory",
-          BrowserContextDependencyManager::GetInstance()) {
-}
+          "ChildStatusReportingServiceFactory",
+          BrowserContextDependencyManager::GetInstance()) {}
 
-ConsumerStatusReportingServiceFactory::
-    ~ConsumerStatusReportingServiceFactory() = default;
+ChildStatusReportingServiceFactory::~ChildStatusReportingServiceFactory() =
+    default;
 
-KeyedService* ConsumerStatusReportingServiceFactory::BuildServiceInstanceFor(
+KeyedService* ChildStatusReportingServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new ConsumerStatusReportingService(context);
+  return new ChildStatusReportingService(context);
 }
 
 }  // namespace chromeos

chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h → chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_FACTORY_H_
 
 #include "base/no_destructor.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -13,33 +13,36 @@ class BrowserContext;
 }
 
 namespace chromeos {
-class ConsumerStatusReportingService;
+class ChildStatusReportingService;
 
-// Singleton that owns all ConsumerStatusReportingService objects and associates
+// Singleton that owns all ChildStatusReportingService objects and associates
 // them with corresponding BrowserContexts. Listens for the BrowserContext's
 // destruction notification and cleans up the associated
-// ConsumerStatusReportingService.
-class ConsumerStatusReportingServiceFactory
+// ChildStatusReportingService.
+class ChildStatusReportingServiceFactory
     : public BrowserContextKeyedServiceFactory {
  public:
-  static ConsumerStatusReportingService* GetForBrowserContext(
+  static ChildStatusReportingService* GetForBrowserContext(
       content::BrowserContext* context);
 
-  static ConsumerStatusReportingServiceFactory* GetInstance();
+  static ChildStatusReportingServiceFactory* GetInstance();
 
  private:
-  friend class base::NoDestructor<ConsumerStatusReportingServiceFactory>;
+  friend class base::NoDestructor<ChildStatusReportingServiceFactory>;
 
-  ConsumerStatusReportingServiceFactory();
-  ~ConsumerStatusReportingServiceFactory() override;
+  ChildStatusReportingServiceFactory();
+  ChildStatusReportingServiceFactory(
+      const ChildStatusReportingServiceFactory&) = delete;
+  ChildStatusReportingServiceFactory& operator=(
+      const ChildStatusReportingServiceFactory&) = delete;
+
+  ~ChildStatusReportingServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(ConsumerStatusReportingServiceFactory);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CONSUMER_STATUS_REPORTING_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_CHILD_STATUS_REPORTING_SERVICE_FACTORY_H_

chrome/browser/chromeos/child_accounts/event_based_status_reporting_service.cc

@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -111,7 +111,7 @@ void EventBasedStatusReportingService::RequestStatusReport(
     StatusReportEvent event) {
   VLOG(1) << StatusReportEventToString(event);
   bool was_scheduled =
-      ConsumerStatusReportingServiceFactory::GetForBrowserContext(context_)
+      ChildStatusReportingServiceFactory::GetForBrowserContext(context_)
           ->RequestImmediateStatusReport();
   if (was_scheduled)
     LogStatusReportEventUMA(event);

chrome/browser/chromeos/child_accounts/event_based_status_reporting_service_factory.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/child_accounts/event_based_status_reporting_service_factory.h"
 
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/event_based_status_reporting_service.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
@@ -32,7 +32,7 @@ EventBasedStatusReportingServiceFactory::
     : BrowserContextKeyedServiceFactory(
           "EventBasedStatusReportingServiceFactory",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ConsumerStatusReportingServiceFactory::GetInstance());
+  DependsOn(ChildStatusReportingServiceFactory::GetInstance());
   DependsOn(ArcAppListPrefsFactory::GetInstance());
   DependsOn(ScreenTimeControllerFactory::GetInstance());
 }

chrome/browser/chromeos/child_accounts/event_based_status_reporting_service_unittest.cc

@@ -11,8 +11,8 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -35,11 +35,11 @@ namespace chromeos {
 namespace {
 
 class TestingConsumerStatusReportingService
-    : public ConsumerStatusReportingService {
+    : public ChildStatusReportingService {
  public:
   explicit TestingConsumerStatusReportingService(
       content::BrowserContext* context)
-      : ConsumerStatusReportingService(context) {}
+      : ChildStatusReportingService(context) {}
   ~TestingConsumerStatusReportingService() override = default;
 
   bool RequestImmediateStatusReport() override {
@@ -108,11 +108,11 @@ class EventBasedStatusReportingServiceTest : public testing::Test {
     session_manager_.SetSessionState(
         session_manager::SessionState::LOGIN_PRIMARY);
 
-    ConsumerStatusReportingServiceFactory::GetInstance()->SetTestingFactory(
+    ChildStatusReportingServiceFactory::GetInstance()->SetTestingFactory(
         profile(),
         base::BindRepeating(&CreateTestingConsumerStatusReportingService));
-    ConsumerStatusReportingService* consumer_status_reporting_service =
-        ConsumerStatusReportingServiceFactory::GetForBrowserContext(profile());
+    ChildStatusReportingService* consumer_status_reporting_service =
+        ChildStatusReportingServiceFactory::GetForBrowserContext(profile());
     test_consumer_status_reporting_service_ =
         static_cast<TestingConsumerStatusReportingService*>(
             consumer_status_reporting_service);

chrome/browser/chromeos/child_accounts/screen_time_controller.cc

@@ -14,8 +14,8 @@
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/time_limit_override.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -117,7 +117,7 @@ void ScreenTimeController::RemoveObserver(Observer* observer) {
 }
 
 base::TimeDelta ScreenTimeController::GetScreenTimeDuration() {
-  return ConsumerStatusReportingServiceFactory::GetForBrowserContext(context_)
+  return ChildStatusReportingServiceFactory::GetForBrowserContext(context_)
       ->GetChildScreenTime();
 }
 
@@ -171,7 +171,7 @@ void ScreenTimeController::CheckTimeLimit(const std::string& source) {
       // this feature is enabled.
       if (!base::FeatureList::IsEnabled(features::kEventBasedStatusReporting)) {
         VLOG(1) << "Request status report before locking screen.";
-        ConsumerStatusReportingServiceFactory::GetForBrowserContext(context_)
+        ChildStatusReportingServiceFactory::GetForBrowserContext(context_)
             ->RequestImmediateStatusReport();
       }
       ForceScreenLockByPolicy();

chrome/browser/chromeos/child_accounts/screen_time_controller_factory.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
@@ -27,7 +27,7 @@ ScreenTimeControllerFactory::ScreenTimeControllerFactory()
     : BrowserContextKeyedServiceFactory(
           "ScreenTimeControllerFactory",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ConsumerStatusReportingServiceFactory::GetInstance());
+  DependsOn(ChildStatusReportingServiceFactory::GetInstance());
 }
 
 ScreenTimeControllerFactory::~ScreenTimeControllerFactory() = default;

chrome/browser/chromeos/login/session/chrome_session_manager.cc

@@ -17,7 +17,7 @@
 #include "chrome/browser/chromeos/app_mode/kiosk_cryptohome_remover.h"
 #include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 #include "chrome/browser/chromeos/crostini/crostini_manager.h"
 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
@@ -168,7 +168,7 @@ void StartUserSession(Profile* user_profile, const std::string& login_user_id) {
         user_profile);
 
     if (user->GetType() == user_manager::USER_TYPE_CHILD) {
-      ConsumerStatusReportingServiceFactory::GetForBrowserContext(user_profile);
+      ChildStatusReportingServiceFactory::GetForBrowserContext(user_profile);
       ScreenTimeControllerFactory::GetForBrowserContext(user_profile);
     }
 

chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -44,7 +44,7 @@
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chrome/browser/chromeos/child_accounts/child_policy_observer.h"
-#include "chrome/browser/chromeos/child_accounts/consumer_status_reporting_service_factory.h"
+#include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
 #include "chrome/browser/chromeos/crostini/crostini_manager.h"
 #include "chrome/browser/chromeos/first_run/first_run.h"
@@ -1781,7 +1781,7 @@ void UserSessionManager::InitializeBrowser(Profile* profile) {
 }
 
 void UserSessionManager::InitializeChildUserServices(Profile* profile) {
-  ConsumerStatusReportingServiceFactory::GetForBrowserContext(profile);
+  ChildStatusReportingServiceFactory::GetForBrowserContext(profile);
   ScreenTimeControllerFactory::GetForBrowserContext(profile);
 }