Index: chrome/browser/chromeos/login/screens/error_screen.cc |
diff --git a/chrome/browser/chromeos/login/screens/error_screen.cc b/chrome/browser/chromeos/login/screens/error_screen.cc |
index 82c1c2ff3a53817c7a90c8397143764f2c412dc7..737fb5a6b8e457e1c46c00327ddbc2a50edc12de 100644 |
--- a/chrome/browser/chromeos/login/screens/error_screen.cc |
+++ b/chrome/browser/chromeos/login/screens/error_screen.cc |
@@ -11,21 +11,30 @@ |
#include "chrome/browser/chromeos/login/wizard_controller.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
+namespace { |
+void* const kCanaryConstant = (void*)0xbaddecafbaddecafLLU; |
+} |
+ |
namespace chromeos { |
ErrorScreen::ErrorScreen(ScreenObserver* screen_observer, |
ErrorScreenActor* actor) |
: WizardScreen(screen_observer), |
+ canary_1_(kCanaryConstant), |
actor_(actor), |
+ canary_2_(kCanaryConstant), |
parent_screen_(OobeDisplay::SCREEN_UNKNOWN), |
weak_factory_(this) { |
- DCHECK(actor_); |
+ CHECK(actor_); |
actor_->SetDelegate(this); |
} |
ErrorScreen::~ErrorScreen() { |
- if (actor_) |
- actor_->SetDelegate(NULL); |
+ CHECK(this); |
+ CHECK(canary_1_ == kCanaryConstant); |
+ CHECK(canary_2_ == kCanaryConstant); |
+ CHECK(actor_); |
+ actor_->SetDelegate(NULL); |
} |
void ErrorScreen::PrepareToShow() { |