Index: chrome/browser/chromeos/login/screens/mock_update_screen.h |
diff --git a/chrome/browser/chromeos/login/screens/mock_update_screen.h b/chrome/browser/chromeos/login/screens/mock_update_screen.h |
index 583347d563901b871ff247f9d888b7c8d0eec8de..e6b0334731493f9579aff6fa4b4dabad0ca96950 100644 |
--- a/chrome/browser/chromeos/login/screens/mock_update_screen.h |
+++ b/chrome/browser/chromeos/login/screens/mock_update_screen.h |
@@ -6,43 +6,37 @@ |
#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_ |
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" |
+#include "chrome/browser/chromeos/login/screens/update_model.h" |
#include "chrome/browser/chromeos/login/screens/update_screen.h" |
-#include "chrome/browser/chromeos/login/screens/update_screen_actor.h" |
+#include "chrome/browser/chromeos/login/screens/update_view.h" |
#include "testing/gmock/include/gmock/gmock.h" |
namespace chromeos { |
class MockUpdateScreen : public UpdateScreen { |
public: |
- MockUpdateScreen(BaseScreenDelegate* base_screen_delegate, |
- UpdateScreenActor* actor); |
+ MockUpdateScreen(BaseScreenDelegate* base_screen_delegate, UpdateView* view); |
virtual ~MockUpdateScreen(); |
MOCK_METHOD0(StartNetworkCheck, void()); |
}; |
-class MockUpdateScreenActor : public UpdateScreenActor { |
+class MockUpdateView : public UpdateView { |
public: |
- MockUpdateScreenActor(); |
- virtual ~MockUpdateScreenActor(); |
+ MockUpdateView(); |
+ virtual ~MockUpdateView(); |
- virtual void SetDelegate(UpdateScreenActor::Delegate* screen) override; |
+ void Bind(UpdateModel& model) override; |
+ void Unbind() override; |
- MOCK_METHOD1(MockSetDelegate, void(UpdateScreenActor::Delegate* screen)); |
+ MOCK_METHOD0(PrepareToShow, void()); |
MOCK_METHOD0(Show, void()); |
MOCK_METHOD0(Hide, void()); |
- MOCK_METHOD0(PrepareToShow, void()); |
- MOCK_METHOD0(ShowManualRebootInfo, void()); |
- MOCK_METHOD1(SetProgress, void(int progress)); |
- MOCK_METHOD1(ShowEstimatedTimeLeft, void(bool enable)); |
- MOCK_METHOD1(SetEstimatedTimeLeft, void(const base::TimeDelta& time)); |
- MOCK_METHOD1(ShowProgressMessage, void(bool enable)); |
- MOCK_METHOD1(SetProgressMessage, void(ProgressMessage message)); |
- MOCK_METHOD1(ShowCurtain, void(bool enable)); |
- MOCK_METHOD1(ShowPreparingUpdatesInfo, void(bool enable)); |
+ MOCK_METHOD1(MockBind, void(UpdateModel& model)); |
+ MOCK_METHOD0(MockUnbind, void()); |
private: |
- UpdateScreenActor::Delegate* screen_; |
+ UpdateModel* model_; |
}; |
} // namespace chromeos |