cros: Fold ResetModel into ResetScreen

chrome/browser/chromeos/login/screens/reset_screen.h

Index: chrome/browser/chromeos/login/screens/reset_screen.h
diff --git a/chrome/browser/chromeos/login/screens/reset_screen.h b/chrome/browser/chromeos/login/screens/reset_screen.h
index 40fac933e8c4ee97316713b43be2bb7caaf68114..77740e6075cb5aeadfc2712896f354b31bd3ef52 100644
--- a/chrome/browser/chromeos/login/screens/reset_screen.h
+++ b/chrome/browser/chromeos/login/screens/reset_screen.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
-#include "chrome/browser/chromeos/login/screens/reset_model.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chromeos/dbus/update_engine_client.h"
 
 
@@ -22,17 +22,19 @@ class ErrorScreen;
 class ResetView;
 
 // Representation independent class that controls screen showing reset to users.
-class ResetScreen : public ResetModel,
-                    public UpdateEngineClient::Observer {
+class ResetScreen : public BaseScreen, public UpdateEngineClient::Observer {
  public:
   ResetScreen(BaseScreenDelegate* base_screen_delegate,
               ResetView* view);
   ~ResetScreen() override;
 
-  // ResetModel implementation:
+  // Called when actor is destroyed so there's no dead reference to it.
+  void OnViewDestroyed(ResetView* view);
+
+ private:
+  // BaseScreen implementation:
   void Show() override;
   void Hide() override;
-  void OnViewDestroyed(ResetView* view) override;
   void OnUserAction(const std::string& action_id) override;
 
   // UpdateEngineClient::Observer implementation:
@@ -40,8 +42,6 @@ class ResetScreen : public ResetModel,
 
   void OnRollbackCheck(bool can_rollback);
 
- private:
-
   enum State {
     STATE_RESTART_REQUIRED = 0,
     STATE_REVERT_PROMISE,