Commit 0818deee authored by Alexey Baskakov's avatar Alexey Baskakov Committed by Commit Bot

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: default avatarEric Willigers <ericwilligers@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684419}
parent 53ef3ccc
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
namespace web_app { namespace web_app {
#define CHECK_NOT_STARTED() \
CHECK(!started_) << "Attempted to set a WebAppProvider subsystem after " \
"Start() was called.";
// static // static
std::unique_ptr<KeyedService> TestWebAppProvider::BuildDefault( std::unique_ptr<KeyedService> TestWebAppProvider::BuildDefault(
content::BrowserContext* context) { content::BrowserContext* context) {
...@@ -58,52 +54,57 @@ TestWebAppProvider::TestWebAppProvider(Profile* profile, ...@@ -58,52 +54,57 @@ TestWebAppProvider::TestWebAppProvider(Profile* profile,
TestWebAppProvider::~TestWebAppProvider() = default; TestWebAppProvider::~TestWebAppProvider() = default;
void TestWebAppProvider::StartImpl() {
if (run_subsystem_startup_tasks_)
WebAppProvider::StartImpl();
}
void TestWebAppProvider::SetRegistrar(std::unique_ptr<AppRegistrar> registrar) { void TestWebAppProvider::SetRegistrar(std::unique_ptr<AppRegistrar> registrar) {
CHECK_NOT_STARTED(); CheckNotStarted();
registrar_ = std::move(registrar); registrar_ = std::move(registrar);
} }
void TestWebAppProvider::SetInstallManager( void TestWebAppProvider::SetInstallManager(
std::unique_ptr<WebAppInstallManager> install_manager) { std::unique_ptr<WebAppInstallManager> install_manager) {
CHECK_NOT_STARTED(); CheckNotStarted();
install_manager_ = std::move(install_manager); install_manager_ = std::move(install_manager);
} }
void TestWebAppProvider::SetInstallFinalizer( void TestWebAppProvider::SetInstallFinalizer(
std::unique_ptr<InstallFinalizer> install_finalizer) { std::unique_ptr<InstallFinalizer> install_finalizer) {
CHECK_NOT_STARTED(); CheckNotStarted();
install_finalizer_ = std::move(install_finalizer); install_finalizer_ = std::move(install_finalizer);
} }
void TestWebAppProvider::SetPendingAppManager( void TestWebAppProvider::SetPendingAppManager(
std::unique_ptr<PendingAppManager> pending_app_manager) { std::unique_ptr<PendingAppManager> pending_app_manager) {
CHECK_NOT_STARTED(); CheckNotStarted();
pending_app_manager_ = std::move(pending_app_manager); pending_app_manager_ = std::move(pending_app_manager);
} }
void TestWebAppProvider::SetWebAppUiManager( void TestWebAppProvider::SetWebAppUiManager(
std::unique_ptr<WebAppUiManager> ui_manager) { std::unique_ptr<WebAppUiManager> ui_manager) {
CHECK_NOT_STARTED(); CheckNotStarted();
ui_manager_ = std::move(ui_manager); ui_manager_ = std::move(ui_manager);
} }
void TestWebAppProvider::SetSystemWebAppManager( void TestWebAppProvider::SetSystemWebAppManager(
std::unique_ptr<SystemWebAppManager> system_web_app_manager) { std::unique_ptr<SystemWebAppManager> system_web_app_manager) {
CHECK_NOT_STARTED(); CheckNotStarted();
system_web_app_manager_ = std::move(system_web_app_manager); system_web_app_manager_ = std::move(system_web_app_manager);
} }
void TestWebAppProvider::SetWebAppPolicyManager( void TestWebAppProvider::SetWebAppPolicyManager(
std::unique_ptr<WebAppPolicyManager> web_app_policy_manager) { std::unique_ptr<WebAppPolicyManager> web_app_policy_manager) {
CHECK_NOT_STARTED(); CheckNotStarted();
web_app_policy_manager_ = std::move(web_app_policy_manager); 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( TestWebAppProviderCreator::TestWebAppProviderCreator(
CreateWebAppProviderCallback callback) CreateWebAppProviderCallback callback)
: callback_(std::move(callback)) { : callback_(std::move(callback)) {
......
...@@ -58,6 +58,8 @@ class TestWebAppProvider : public WebAppProvider { ...@@ -58,6 +58,8 @@ class TestWebAppProvider : public WebAppProvider {
std::unique_ptr<WebAppPolicyManager> web_app_policy_manager); std::unique_ptr<WebAppPolicyManager> web_app_policy_manager);
private: private:
void CheckNotStarted() const;
// WebAppProvider: // WebAppProvider:
void StartImpl() override; void StartImpl() override;
......
...@@ -35,10 +35,6 @@ ...@@ -35,10 +35,6 @@
#include "components/pref_registry/pref_registry_syncable.h" #include "components/pref_registry/pref_registry_syncable.h"
#include "content/public/browser/web_contents.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 { namespace web_app {
// static // static
...@@ -81,32 +77,32 @@ void WebAppProvider::Start() { ...@@ -81,32 +77,32 @@ void WebAppProvider::Start() {
} }
AppRegistrar& WebAppProvider::registrar() { AppRegistrar& WebAppProvider::registrar() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return *registrar_; return *registrar_;
} }
InstallManager& WebAppProvider::install_manager() { InstallManager& WebAppProvider::install_manager() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return *install_manager_; return *install_manager_;
} }
PendingAppManager& WebAppProvider::pending_app_manager() { PendingAppManager& WebAppProvider::pending_app_manager() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return *pending_app_manager_; return *pending_app_manager_;
} }
WebAppPolicyManager* WebAppProvider::policy_manager() { WebAppPolicyManager* WebAppProvider::policy_manager() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return web_app_policy_manager_.get(); return web_app_policy_manager_.get();
} }
WebAppUiManager& WebAppProvider::ui_manager() { WebAppUiManager& WebAppProvider::ui_manager() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return *ui_manager_; return *ui_manager_;
} }
SystemWebAppManager& WebAppProvider::system_web_app_manager() { SystemWebAppManager& WebAppProvider::system_web_app_manager() {
DCHECK_IS_CONNECTED(); CheckIsConnected();
return *system_web_app_manager_; return *system_web_app_manager_;
} }
...@@ -182,6 +178,11 @@ void WebAppProvider::OnRegistryReady() { ...@@ -182,6 +178,11 @@ void WebAppProvider::OnRegistryReady() {
on_registry_ready_.Signal(); on_registry_ready_.Signal();
} }
void WebAppProvider::CheckIsConnected() const {
DCHECK(connected_) << "Attempted to access Web App subsystem while "
"WebAppProvider is not connected.";
}
// static // static
void WebAppProvider::RegisterProfilePrefs( void WebAppProvider::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
......
...@@ -109,6 +109,8 @@ class WebAppProvider : public WebAppProviderBase { ...@@ -109,6 +109,8 @@ class WebAppProvider : public WebAppProviderBase {
void StartRegistry(); void StartRegistry();
void OnRegistryReady(); void OnRegistryReady();
void CheckIsConnected() const;
// New extension-independent subsystems: // New extension-independent subsystems:
std::unique_ptr<WebAppAudioFocusIdMap> audio_focus_id_map_; std::unique_ptr<WebAppAudioFocusIdMap> audio_focus_id_map_;
std::unique_ptr<WebAppDatabaseFactory> database_factory_; std::unique_ptr<WebAppDatabaseFactory> database_factory_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment