WebApp: Replace CHECK macros with member functions.

A writer of a test will see a callstack anyway.

Bug: 877898
Change-Id: I0a77bf5374d59de3eb1249d89db0be8852b16fa0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1738366Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684419}

chrome/browser/web_applications/test/test_web_app_provider.cc

@@ -22,10 +22,6 @@
 
 namespace web_app {
 
-#define CHECK_NOT_STARTED()                                                \
-  CHECK(!started_) << "Attempted to set a WebAppProvider subsystem after " \
-                      "Start() was called.";
-
 // static
 std::unique_ptr<KeyedService> TestWebAppProvider::BuildDefault(
     content::BrowserContext* context) {
@@ -58,52 +54,57 @@ TestWebAppProvider::TestWebAppProvider(Profile* profile,
 
 TestWebAppProvider::~TestWebAppProvider() = default;
 
-void TestWebAppProvider::StartImpl() {
-  if (run_subsystem_startup_tasks_)
-    WebAppProvider::StartImpl();
-}
-
 void TestWebAppProvider::SetRegistrar(std::unique_ptr<AppRegistrar> registrar) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   registrar_ = std::move(registrar);
 }
 
 void TestWebAppProvider::SetInstallManager(
     std::unique_ptr<WebAppInstallManager> install_manager) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   install_manager_ = std::move(install_manager);
 }
 
 void TestWebAppProvider::SetInstallFinalizer(
     std::unique_ptr<InstallFinalizer> install_finalizer) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   install_finalizer_ = std::move(install_finalizer);
 }
 
 void TestWebAppProvider::SetPendingAppManager(
     std::unique_ptr<PendingAppManager> pending_app_manager) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   pending_app_manager_ = std::move(pending_app_manager);
 }
 
 void TestWebAppProvider::SetWebAppUiManager(
     std::unique_ptr<WebAppUiManager> ui_manager) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   ui_manager_ = std::move(ui_manager);
 }
 
 void TestWebAppProvider::SetSystemWebAppManager(
     std::unique_ptr<SystemWebAppManager> system_web_app_manager) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   system_web_app_manager_ = std::move(system_web_app_manager);
 }
 
 void TestWebAppProvider::SetWebAppPolicyManager(
     std::unique_ptr<WebAppPolicyManager> web_app_policy_manager) {
-  CHECK_NOT_STARTED();
+  CheckNotStarted();
   web_app_policy_manager_ = std::move(web_app_policy_manager);
 }
 
+void TestWebAppProvider::CheckNotStarted() const {
+  CHECK(!started_) << "Attempted to set a WebAppProvider subsystem after "
+                      "Start() was called.";
+}
+
+void TestWebAppProvider::StartImpl() {
+  if (run_subsystem_startup_tasks_)
+    WebAppProvider::StartImpl();
+}
+
 TestWebAppProviderCreator::TestWebAppProviderCreator(
     CreateWebAppProviderCallback callback)
     : callback_(std::move(callback)) {

chrome/browser/web_applications/test/test_web_app_provider.h

@@ -58,6 +58,8 @@ class TestWebAppProvider : public WebAppProvider {
       std::unique_ptr<WebAppPolicyManager> web_app_policy_manager);
 
  private:
+  void CheckNotStarted() const;
+
   // WebAppProvider:
   void StartImpl() override;
 

chrome/browser/web_applications/web_app_provider.cc

@@ -35,10 +35,6 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/web_contents.h"
 
-#define DCHECK_IS_CONNECTED()                                          \
-  DCHECK(connected_) << "Attempted to access Web App subsystem while " \
-                        "WebAppProvider is not connected."
-
 namespace web_app {
 
 // static
@@ -81,32 +77,32 @@ void WebAppProvider::Start() {
 }
 
 AppRegistrar& WebAppProvider::registrar() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return *registrar_;
 }
 
 InstallManager& WebAppProvider::install_manager() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return *install_manager_;
 }
 
 PendingAppManager& WebAppProvider::pending_app_manager() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return *pending_app_manager_;
 }
 
 WebAppPolicyManager* WebAppProvider::policy_manager() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return web_app_policy_manager_.get();
 }
 
 WebAppUiManager& WebAppProvider::ui_manager() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return *ui_manager_;
 }
 
 SystemWebAppManager& WebAppProvider::system_web_app_manager() {
-  DCHECK_IS_CONNECTED();
+  CheckIsConnected();
   return *system_web_app_manager_;
 }
 
@@ -182,6 +178,11 @@ void WebAppProvider::OnRegistryReady() {
   on_registry_ready_.Signal();
 }
 
+void WebAppProvider::CheckIsConnected() const {
+  DCHECK(connected_) << "Attempted to access Web App subsystem while "
+                        "WebAppProvider is not connected.";
+}
+
 // static
 void WebAppProvider::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {

chrome/browser/web_applications/web_app_provider.h

@@ -109,6 +109,8 @@ class WebAppProvider : public WebAppProviderBase {
   void StartRegistry();
   void OnRegistryReady();
 
+  void CheckIsConnected() const;
+
   // New extension-independent subsystems:
   std::unique_ptr<WebAppAudioFocusIdMap> audio_focus_id_map_;
   std::unique_ptr<WebAppDatabaseFactory> database_factory_;