WizardScreen is merged to BaseScreen.

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

Index: chrome/browser/chromeos/login/screens/user_image_screen.h
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.h b/chrome/browser/chromeos/login/screens/user_image_screen.h
index ee3cd299f47bb2e2662d32b1744bca9e169cf4b7..9f944f49226e9bc646cfa2e0acd10f2c6628c661 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen.h
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.h
@@ -8,8 +8,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
 #include "chrome/browser/image_decoder.h"
 #include "components/user_manager/user.h"
@@ -30,12 +30,12 @@ namespace chromeos {
 class UserImageManager;
 class ScreenManager;
 
-class UserImageScreen: public WizardScreen,
-                       public UserImageScreenActor::Delegate,
-                       public ImageDecoder::Delegate,
-                       public content::NotificationObserver,
-                       public UserImageSyncObserver::Observer,
-                       public CameraPresenceNotifier::Observer {
+class UserImageScreen : public BaseScreen,
+                        public UserImageScreenActor::Delegate,
+                        public ImageDecoder::Delegate,
+                        public content::NotificationObserver,
+                        public UserImageSyncObserver::Observer,
+                        public CameraPresenceNotifier::Observer {
  public:
   UserImageScreen(ScreenObserver* screen_observer,
                   UserImageScreenActor* actor);
@@ -43,7 +43,7 @@ class UserImageScreen: public WizardScreen,
 
   static UserImageScreen* Get(ScreenManager* manager);
 
-  // WizardScreen implementation:
+  // BaseScreen implementation:
   virtual void PrepareToShow() override;
   virtual void Show() override;
   virtual void Hide() override;