Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
index a3bfa3bc7cf5af20db8a612b0d12a392045177c5..7217b30f6d90cca8c8276a13d778a9c8163ade61 100644 |
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
@@ -73,7 +73,8 @@ void EnrollmentScreen::SetParameters( |
user_ = user.empty() ? user : gaia::CanonicalizeEmail(user); |
auth_token_ = auth_token; |
shark_controller_ = shark_controller; |
- DCHECK(!remora_controller_); |
+ if (remora_controller_) |
+ remora_controller_->RemoveObserver(this); |
remora_controller_ = remora_controller; |
if (remora_controller_) |
remora_controller_->AddObserver(this); |