Index: chrome/browser/chromeos/login/mock_update_screen.cc |
diff --git a/chrome/browser/chromeos/login/mock_update_screen.cc b/chrome/browser/chromeos/login/mock_update_screen.cc |
index 703f705a6bec7d471452730c90408ace7787df2d..246ed439877d6aff608ffd49dd1841f4196b6400 100644 |
--- a/chrome/browser/chromeos/login/mock_update_screen.cc |
+++ b/chrome/browser/chromeos/login/mock_update_screen.cc |
@@ -6,6 +6,9 @@ |
namespace chromeos { |
+using ::testing::AtLeast; |
+using ::testing::NotNull; |
+ |
MockUpdateScreen::MockUpdateScreen(ScreenObserver* screen_observer, |
UpdateScreenActor* actor) |
: UpdateScreen(screen_observer, actor) { |
@@ -14,10 +17,19 @@ MockUpdateScreen::MockUpdateScreen(ScreenObserver* screen_observer, |
MockUpdateScreen::~MockUpdateScreen() { |
} |
-MockUpdateScreenActor::MockUpdateScreenActor() { |
+MockUpdateScreenActor::MockUpdateScreenActor() |
+ : screen_(NULL) { |
+ EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1)); |
} |
MockUpdateScreenActor::~MockUpdateScreenActor() { |
+ if (screen_) |
+ screen_->OnActorDestroyed(this); |
+} |
+ |
+void MockUpdateScreenActor::SetDelegate(UpdateScreenActor::Delegate* screen) { |
+ screen_ = screen; |
+ MockSetDelegate(screen); |
} |
} // namespace chromeos |