Revert r48735 "Added user image screen for new user login (or old user logging in through"

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 6836994542336d45391e29cd12af95e4e2ef8605..0bc0f6a56fe60c93fb9aa04c90446c7776ecd3ce 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -22,7 +22,6 @@ class AccountScreen;
 class BackgroundView;
 class LoginScreen;
 class NetworkScreen;
-class UserImageScreen;
 class UpdateScreen;
 class StartupCustomizationDocument;
 }
@@ -76,14 +75,12 @@ class WizardController : public chromeos::ScreenObserver,
   chromeos::LoginScreen* GetLoginScreen();
   chromeos::AccountScreen* GetAccountScreen();
   chromeos::UpdateScreen* GetUpdateScreen();
-  chromeos::UserImageScreen* GetUserImageScreen();
 
   // Show specific screen.
   void ShowNetworkScreen();
   void ShowLoginScreen();
   void ShowAccountScreen();
   void ShowUpdateScreen();
-  void ShowUserImageScreen();
 
   // Returns a pointer to the current screen or NULL if there's no such
   // screen.
@@ -101,7 +98,6 @@ class WizardController : public chromeos::ScreenObserver,
   static const char kLoginScreenName[];
   static const char kAccountScreenName[];
   static const char kUpdateScreenName[];
-  static const char kUserImageScreenName[];
   static const char kOutOfBoxScreenName[];
   static const char kTestNoScreenName[];
 
@@ -117,8 +113,6 @@ class WizardController : public chromeos::ScreenObserver,
   void OnUpdateCompleted();
   void OnUpdateErrorCheckingForUpdate();
   void OnUpdateErrorUpdating();
-  void OnUserImageSelected();
-  void OnUserImageSkipped();
 
   // Switches from one screen to another.
   void SetCurrentScreen(WizardScreen* screen);
@@ -154,7 +148,6 @@ class WizardController : public chromeos::ScreenObserver,
   scoped_ptr<chromeos::LoginScreen> login_screen_;
   scoped_ptr<chromeos::AccountScreen> account_screen_;
   scoped_ptr<chromeos::UpdateScreen> update_screen_;
-  scoped_ptr<chromeos::UserImageScreen> user_image_screen_;
 
   // Screen that's currently active.
   WizardScreen* current_screen_;