Update locally managed user creation flow according to mocks

chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
index 55110a6d9fc94f87bee61da0452f26e868f5f9e2..654e2532f83c9bbf0d9c3d9f82e416f5d9d54acb 100644
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
@@ -72,11 +72,10 @@ void LocallyManagedUserCreationScreen::Show() {
     actor_->Show();
     // TODO(antrim) : temorary hack (until upcoming hackaton). Should be
     // removed once we have screens reworked.
-    if (on_image_screen_) {
-      actor_->ShowPostImageSelectionScreen();
-    } else {
-      actor_->ShowInitialScreen();
-    }
+    if (on_image_screen_)
+      actor_->ShowTutorialPage();
+    else
+      actor_->ShowIntroPage();
   }
 
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
@@ -105,7 +104,7 @@ void LocallyManagedUserCreationScreen::
     ShowManagerInconsistentStateErrorScreen() {
   if (!actor_)
     return;
-  actor_->ShowErrorMessage(
+  actor_->ShowErrorPage(
       l10n_util::GetStringUTF16(
           IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE),
       false);
@@ -113,7 +112,7 @@ void LocallyManagedUserCreationScreen::
 
 void LocallyManagedUserCreationScreen::ShowInitialScreen() {
   if (actor_)
-    actor_->ShowInitialScreen();
+    actor_->ShowIntroPage();
 }
 
 void LocallyManagedUserCreationScreen::Hide() {
@@ -136,20 +135,12 @@ void LocallyManagedUserCreationScreen::FinishFlow() {
   controller_->FinishCreation();
 }
 
-void LocallyManagedUserCreationScreen::RetryLastStep() {
-  controller_->RetryLastStep();
-}
-
-void LocallyManagedUserCreationScreen::RunFlow(
-    string16& display_name,
-    std::string& managed_user_password,
+void LocallyManagedUserCreationScreen::AuthenticateManager(
     std::string& manager_id,
     std::string& manager_password) {
-
   // Make sure no two controllers exist at the same time.
   controller_.reset();
   controller_.reset(new LocallyManagedUserController(this));
-  controller_->SetUpCreation(display_name, managed_user_password);
 
   ExistingUserController::current_controller()->
       Login(UserContext(manager_id,
@@ -157,15 +148,27 @@ void LocallyManagedUserCreationScreen::RunFlow(
                         std::string()  /* auth_code */));
 }
 
+void LocallyManagedUserCreationScreen::CreateManagedUser(
+    string16& display_name,
+    std::string& managed_user_password) {
+  DCHECK(controller_.get());
+  controller_->SetUpCreation(display_name, managed_user_password);
+  controller_->StartCreation();
+}
+
 void LocallyManagedUserCreationScreen::OnManagerLoginFailure() {
   if (actor_)
     actor_->ShowManagerPasswordError();
 }
 
-void LocallyManagedUserCreationScreen::OnManagerSignIn() {
+void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated() {
   if (actor_)
-    actor_->ShowProgressScreen();
-  controller_->StartCreation();
+    actor_->ShowUsernamePage();
+}
+
+void LocallyManagedUserCreationScreen::OnManagerCryptohomeAuthenticated() {
+  if (actor_)
+    actor_->ShowProgressPage();
 }
 
 void LocallyManagedUserCreationScreen::OnExit() {}
@@ -205,7 +208,7 @@ void LocallyManagedUserCreationScreen::OnCreationError(
       NOTREACHED();
   }
   if (actor_)
-    actor_->ShowErrorMessage(message, recoverable);
+    actor_->ShowErrorPage(message, recoverable);
 }
 
 void LocallyManagedUserCreationScreen::SelectPicture() {