cros: Fold UserBoardModel into UserSelectionScreen.

chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
index 74b7ca00b2ac812204abbad6131c6a4f4c2c614c..1b25debdcf733c030e923b0008b8ebb108b31e88 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
@@ -15,6 +15,9 @@
 
 namespace chromeos {
 
+// TODO(jdufault): Rename to UserSelectionScreenHandler and ensure this in the
+// right directory. See crbug.com/672142.
+
 // A class that handles WebUI hooks in Gaia screen.
 class UserBoardScreenHandler : public BaseScreenHandler, public UserBoardView {
  public:
@@ -51,12 +54,11 @@ class UserBoardScreenHandler : public BaseScreenHandler, public UserBoardView {
       const AccountId& account_id,
       proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
       const base::string16& initial_value) override;
-
-  void Bind(UserBoardModel& model) override;
+  void Bind(UserSelectionScreen* screen) override;
   void Unbind() override;
   base::WeakPtr<UserBoardView> GetWeakPtr() override;
 
-  UserBoardModel* model_;
+  UserSelectionScreen* screen_ = nullptr;
   base::WeakPtrFactory<UserBoardScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserBoardScreenHandler);