[CrOS PhoneHub] Create FakePhoneHubManager.

* Moves PhoneHubManager to PhoneHubManagerImpl.
* PhoneHubManagerImpl and FakePhoneHubManager are now derived classes.
* FakePhoneHubManager will be used by the debug UI to be added in a
  later CL.

Bug: 1106937
Change-Id: Iee1c6b4b787f36a7a50eb83fcd1ae1e626f7eecc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375740Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801852}

chrome/browser/chromeos/phonehub/phone_hub_manager_factory.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/components/phonehub/notification_access_manager_impl.h"
-#include "chromeos/components/phonehub/phone_hub_manager.h"
+#include "chromeos/components/phonehub/phone_hub_manager_impl.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "chromeos/services/multidevice_setup/public/cpp/prefs.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -41,7 +41,7 @@ bool IsLoggedInAsPrimaryUser(Profile* profile) {
 
 // static
 PhoneHubManager* PhoneHubManagerFactory::GetForProfile(Profile* profile) {
-  return static_cast<PhoneHubManager*>(
+  return static_cast<PhoneHubManagerImpl*>(
       PhoneHubManagerFactory::GetInstance()->GetServiceForBrowserContext(
           profile, /*create=*/true));
 }
@@ -75,7 +75,7 @@ KeyedService* PhoneHubManagerFactory::BuildServiceInstanceFor(
   if (IsProhibitedByPolicy(profile))
     return nullptr;
 
-  PhoneHubManager* phone_hub_manager = new PhoneHubManager(
+  PhoneHubManagerImpl* phone_hub_manager = new PhoneHubManagerImpl(
       profile->GetPrefs(),
       device_sync::DeviceSyncClientFactory::GetForProfile(profile),
       multidevice_setup::MultiDeviceSetupClientFactory::GetForProfile(profile));

chrome/browser/ui/webui/settings/chromeos/multidevice_section.cc

@@ -334,8 +334,9 @@ void MultiDeviceSection::AddHandlers(content::WebUI* web_ui) {
   web_ui->AddMessageHandler(
       std::make_unique<chromeos::settings::MultideviceHandler>(
           pref_service_, multidevice_setup_client_,
-          phone_hub_manager_ ? phone_hub_manager_->notification_access_manager()
-                             : nullptr,
+          phone_hub_manager_
+              ? phone_hub_manager_->GetNotificationAccessManager()
+              : nullptr,
           android_sms_service_
               ? android_sms_service_->android_sms_pairing_state_tracker()
               : nullptr,

chrome/browser/ui/webui/settings/settings_ui.cc

@@ -423,8 +423,9 @@ void SettingsUI::InitBrowserSettingsWebUIHandlers() {
             profile->GetPrefs(),
             chromeos::multidevice_setup::MultiDeviceSetupClientFactory::
                 GetForProfile(profile),
-            phone_hub_manager ? phone_hub_manager->notification_access_manager()
-                              : nullptr,
+            phone_hub_manager
+                ? phone_hub_manager->GetNotificationAccessManager()
+                : nullptr,
             android_sms_service
                 ? android_sms_service->android_sms_pairing_state_tracker()
                 : nullptr,

chromeos/components/phonehub/BUILD.gn

@@ -24,8 +24,9 @@ static_library("phonehub") {
     "notification_access_manager_impl.h",
     "notification_access_setup_operation.cc",
     "notification_access_setup_operation.h",
-    "phone_hub_manager.cc",
     "phone_hub_manager.h",
+    "phone_hub_manager_impl.cc",
+    "phone_hub_manager_impl.h",
     "phone_model.cc",
     "phone_model.h",
     "phone_status_model.cc",
@@ -60,6 +61,8 @@ static_library("test_support") {
     "fake_feature_status_provider.h",
     "fake_notification_access_manager.cc",
     "fake_notification_access_manager.h",
+    "fake_phone_hub_manager.cc",
+    "fake_phone_hub_manager.h",
     "fake_tether_controller.cc",
     "fake_tether_controller.h",
     "phone_model_test_util.cc",

chromeos/components/phonehub/fake_phone_hub_manager.cc

+// Copyright 2020 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 "chromeos/components/phonehub/fake_phone_hub_manager.h"
+
+#include "chromeos/components/phonehub/fake_feature_status_provider.h"
+#include "chromeos/components/phonehub/fake_notification_access_manager.h"
+#include "chromeos/components/phonehub/fake_tether_controller.h"
+#include "chromeos/components/phonehub/mutable_phone_model.h"
+
+namespace chromeos {
+namespace phonehub {
+
+FakePhoneHubManager::FakePhoneHubManager()
+    : fake_feature_status_provider_(
+          std::make_unique<FakeFeatureStatusProvider>()),
+      fake_notification_access_manager_(
+          std::make_unique<FakeNotificationAccessManager>()),
+      mutable_phone_model_(std::make_unique<MutablePhoneModel>()),
+      fake_tether_controller_(std::make_unique<FakeTetherController>()) {}
+
+FakePhoneHubManager::~FakePhoneHubManager() = default;
+
+FeatureStatusProvider* FakePhoneHubManager::GetFeatureStatusProvider() {
+  return fake_feature_status_provider_.get();
+}
+
+NotificationAccessManager* FakePhoneHubManager::GetNotificationAccessManager() {
+  return fake_notification_access_manager_.get();
+}
+
+PhoneModel* FakePhoneHubManager::GetPhoneModel() {
+  return mutable_phone_model_.get();
+}
+
+TetherController* FakePhoneHubManager::GetTetherController() {
+  return fake_tether_controller_.get();
+}
+
+}  // namespace phonehub
+}  // namespace chromeos

chromeos/components/phonehub/fake_phone_hub_manager.h

+// Copyright 2020 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.
+
+#ifndef CHROMEOS_COMPONENTS_PHONEHUB_FAKE_PHONE_HUB_MANAGER_H_
+#define CHROMEOS_COMPONENTS_PHONEHUB_FAKE_PHONE_HUB_MANAGER_H_
+
+#include <memory>
+
+#include "chromeos/components/phonehub/phone_hub_manager.h"
+
+namespace chromeos {
+
+namespace phonehub {
+
+class FakeFeatureStatusProvider;
+class FakeNotificationAccessManager;
+class MutablePhoneModel;
+class FakeTetherController;
+
+// This class initializes fake versions of the core business logic of Phone Hub.
+class FakePhoneHubManager : public PhoneHubManager {
+ public:
+  FakePhoneHubManager();
+  ~FakePhoneHubManager() override;
+
+  FakeFeatureStatusProvider* fake_feature_status_provider() {
+    return fake_feature_status_provider_.get();
+  }
+
+  FakeNotificationAccessManager* fake_notification_access_manager() {
+    return fake_notification_access_manager_.get();
+  }
+
+  MutablePhoneModel* mutable_phone_model() {
+    return mutable_phone_model_.get();
+  }
+
+  FakeTetherController* fake_tether_controller() {
+    return fake_tether_controller_.get();
+  }
+
+ private:
+  // PhoneHubManager:
+  FeatureStatusProvider* GetFeatureStatusProvider() override;
+  NotificationAccessManager* GetNotificationAccessManager() override;
+  PhoneModel* GetPhoneModel() override;
+  TetherController* GetTetherController() override;
+
+  std::unique_ptr<FakeFeatureStatusProvider> fake_feature_status_provider_;
+  std::unique_ptr<FakeNotificationAccessManager>
+      fake_notification_access_manager_;
+  std::unique_ptr<MutablePhoneModel> mutable_phone_model_;
+  std::unique_ptr<FakeTetherController> fake_tether_controller_;
+};
+
+}  // namespace phonehub
+}  // namespace chromeos
+
+#endif  // CHROMEOS_COMPONENTS_PHONEHUB_FAKE_PHONE_HUB_MANAGER_H_

chromeos/components/phonehub/phone_hub_manager.h

@@ -5,23 +5,7 @@
 #ifndef CHROMEOS_COMPONENTS_PHONEHUB_PHONE_HUB_MANAGER_H_
 #define CHROMEOS_COMPONENTS_PHONEHUB_PHONE_HUB_MANAGER_H_
 
-#include <memory>
-
-#include "base/callback_forward.h"
-#include "components/keyed_service/core/keyed_service.h"
-
-class PrefService;
-
 namespace chromeos {
-
-namespace device_sync {
-class DeviceSyncClient;
-}  // namespace device_sync
-
-namespace multidevice_setup {
-class MultiDeviceSetupClient;
-}  // namespace multidevice_setup
-
 namespace phonehub {
 
 class FeatureStatusProvider;
@@ -29,40 +13,25 @@ class NotificationAccessManager;
 class PhoneModel;
 class TetherController;
 
-// Implements the core logic of the Phone Hub feature and exposes interfaces via
-// its public API. Implemented as a KeyedService which is keyed by the primary
-// Profile; since there is only one primary Profile, the class is intended to be
-// a singleton.
-class PhoneHubManager : public KeyedService {
+// Responsible for the core logic of the Phone Hub feature and exposes
+// interfaces via its public API. This class is intended to be a singleton.
+class PhoneHubManager {
  public:
-  PhoneHubManager(
-      PrefService* pref_service,
-      device_sync::DeviceSyncClient* device_sync_client,
-      multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client);
+  virtual ~PhoneHubManager() = default;
+
   PhoneHubManager(const PhoneHubManager&) = delete;
   PhoneHubManager& operator=(const PhoneHubManager&) = delete;
-  ~PhoneHubManager() override;
-
-  FeatureStatusProvider* feature_status_provider() {
-    return feature_status_provider_.get();
-  }
 
-  NotificationAccessManager* notification_access_manager() {
-    return notification_access_manager_.get();
-  }
+  virtual FeatureStatusProvider* GetFeatureStatusProvider() = 0;
 
-  PhoneModel* phone_model() { return phone_model_.get(); }
+  virtual NotificationAccessManager* GetNotificationAccessManager() = 0;
 
-  TetherController* tether_controller() { return tether_controller_.get(); }
+  virtual PhoneModel* GetPhoneModel() = 0;
 
- private:
-  // KeyedService:
-  void Shutdown() override;
+  virtual TetherController* GetTetherController() = 0;
 
-  std::unique_ptr<FeatureStatusProvider> feature_status_provider_;
-  std::unique_ptr<NotificationAccessManager> notification_access_manager_;
-  std::unique_ptr<PhoneModel> phone_model_;
-  std::unique_ptr<TetherController> tether_controller_;
+ protected:
+  PhoneHubManager() = default;
 };
 
 }  // namespace phonehub

chromeos/components/phonehub/phone_hub_manager.cc → chromeos/components/phonehub/phone_hub_manager_impl.cc

@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/components/phonehub/phone_hub_manager.h"
+#include "chromeos/components/phonehub/phone_hub_manager_impl.h"
 
-#include "base/callback.h"
-#include "base/no_destructor.h"
 #include "chromeos/components/phonehub/feature_status_provider_impl.h"
 #include "chromeos/components/phonehub/mutable_phone_model.h"
 #include "chromeos/components/phonehub/notification_access_manager_impl.h"
@@ -14,7 +12,7 @@
 namespace chromeos {
 namespace phonehub {
 
-PhoneHubManager::PhoneHubManager(
+PhoneHubManagerImpl::PhoneHubManagerImpl(
     PrefService* pref_service,
     device_sync::DeviceSyncClient* device_sync_client,
     multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client)
@@ -27,9 +25,25 @@ PhoneHubManager::PhoneHubManager(
       tether_controller_(
           std::make_unique<TetherControllerImpl>(multidevice_setup_client)) {}
 
-PhoneHubManager::~PhoneHubManager() = default;
+PhoneHubManagerImpl::~PhoneHubManagerImpl() = default;
 
-void PhoneHubManager::Shutdown() {
+FeatureStatusProvider* PhoneHubManagerImpl::GetFeatureStatusProvider() {
+  return feature_status_provider_.get();
+}
+
+NotificationAccessManager* PhoneHubManagerImpl::GetNotificationAccessManager() {
+  return notification_access_manager_.get();
+}
+
+PhoneModel* PhoneHubManagerImpl::GetPhoneModel() {
+  return phone_model_.get();
+}
+
+TetherController* PhoneHubManagerImpl::GetTetherController() {
+  return tether_controller_.get();
+}
+
+void PhoneHubManagerImpl::Shutdown() {
   tether_controller_.reset();
   phone_model_.reset();
   notification_access_manager_.reset();

chromeos/components/phonehub/phone_hub_manager_impl.h

+// Copyright 2020 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.
+
+#ifndef CHROMEOS_COMPONENTS_PHONEHUB_PHONE_HUB_MANAGER_IMPL_H_
+#define CHROMEOS_COMPONENTS_PHONEHUB_PHONE_HUB_MANAGER_IMPL_H_
+
+#include <memory>
+
+#include "chromeos/components/phonehub/phone_hub_manager.h"
+#include "components/keyed_service/core/keyed_service.h"
+
+class PrefService;
+
+namespace chromeos {
+
+namespace device_sync {
+class DeviceSyncClient;
+}  // namespace device_sync
+
+namespace multidevice_setup {
+class MultiDeviceSetupClient;
+}  // namespace multidevice_setup
+
+namespace phonehub {
+
+// Implemented as a KeyedService which is keyed by the primary Profile.
+class PhoneHubManagerImpl : public PhoneHubManager, public KeyedService {
+ public:
+  PhoneHubManagerImpl(
+      PrefService* pref_service,
+      device_sync::DeviceSyncClient* device_sync_client,
+      multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client);
+  ~PhoneHubManagerImpl() override;
+
+  // PhoneHubManager:
+  FeatureStatusProvider* GetFeatureStatusProvider() override;
+  NotificationAccessManager* GetNotificationAccessManager() override;
+  PhoneModel* GetPhoneModel() override;
+  TetherController* GetTetherController() override;
+
+ private:
+  // KeyedService:
+  void Shutdown() override;
+
+  std::unique_ptr<FeatureStatusProvider> feature_status_provider_;
+  std::unique_ptr<NotificationAccessManager> notification_access_manager_;
+  std::unique_ptr<PhoneModel> phone_model_;
+  std::unique_ptr<TetherController> tether_controller_;
+};
+
+}  // namespace phonehub
+}  // namespace chromeos
+
+#endif  // CHROMEOS_COMPONENTS_PHONEHUB_PHONE_HUB_MANAGER_IMPL_H_