Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1825)

Unified Diff: chrome/browser/supervised_user/supervised_user_settings_service.cc

Issue 2138593002: Remove CHECKs used for debugging bug 425785. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_settings_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/supervised_user/supervised_user_settings_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
index cf8dc890ea57decc7ee5efe0f2d04216edde10bf..6561085c8fe1ff64e518c7b0bef729ad891d8c6f 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -75,9 +75,8 @@ void SupervisedUserSettingsService::Init(
Init(store);
if (load_synchronously) {
store_->ReadPrefs();
- // TODO(bauerb): Temporary CHECK while investigating
- // https://crbug.com/425785. Remove (or change to DCHECK) once the bug
- // is fixed.
+ // This should be a DCHECK, but it is triggering in the wild.
+ // https://crbug.com/627031
CHECK(store_->IsInitializationComplete());
} else {
store_->ReadPrefsAsync(nullptr);
@@ -102,7 +101,7 @@ SupervisedUserSettingsService::Subscribe(const SettingsCallback& callback) {
return callback_list_.Add(callback);
}
-Profile* SupervisedUserSettingsService::GetProfile(){
+Profile* SupervisedUserSettingsService::GetProfile() {
return profile_;
}
@@ -111,7 +110,7 @@ void SupervisedUserSettingsService::SetActive(bool active) {
InformSubscribers();
}
-bool SupervisedUserSettingsService::IsReady() {
+bool SupervisedUserSettingsService::IsReady() const {
// Initialization cannot be complete but have failed at the same time.
DCHECK(!(store_->IsInitializationComplete() && initialization_failed_));
return initialization_failed_ || store_->IsInitializationComplete();
@@ -404,9 +403,7 @@ void SupervisedUserSettingsService::OnInitializationCompleted(bool success) {
initialization_failed_ = true;
}
- // TODO(bauerb): Temporary CHECK while investigating https://crbug.com/425785.
- // Remove (or change back to DCHECK) once the bug is fixed.
- CHECK(IsReady());
+ DCHECK(IsReady());
InformSubscribers();
}
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_settings_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698