WizardScreen is merged to BaseScreen.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_BASE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_BASE_SCREEN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 class ScreenContext;
+class ScreenObserver;
 
 // Base class for the all OOBE/login/before-session screens.
 // Screens are identified by ID, screen and it's JS counterpart must have same
 // id.
 // Most of the screens will be re-created for each appearance with Initialize()
 // method called just once. However if initialization is too expensive, screen
 // can override result of IsPermanent() method, and do clean-up upon subsequent
 // Initialize() method calls.
 class BaseScreen {
  public:
-  BaseScreen();
+  explicit BaseScreen(ScreenObserver* screen_observer);
   virtual ~BaseScreen();
 
   // ---- Old implementation ----
 
   virtual void PrepareToShow() = 0;
 
   // Makes wizard screen visible.
   virtual void Show() = 0;
 
   // Makes wizard screen invisible.
@@ skipping 39 matching lines @@
 
   // Called when button with |button_id| was pressed. Notification
   // about this event comes from the JS counterpart.
   virtual void OnButtonPressed(const std::string& button_id);
 
   // Called when context for the currenct screen was
   // changed. Notification about this event comes from the JS
   // counterpart.
   virtual void OnContextChanged(const base::DictionaryValue* diff);
 
+  ScreenObserver* get_screen_observer() const { return screen_observer_; }
+
  private:
+  FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
+  FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess);
+  FRIEND_TEST_ALL_PREFIXES(ProvisionedEnrollmentScreenTest, TestBackButton);
+
+  friend class NetworkScreenTest;
   friend class ScreenManager;
+  friend class UpdateScreenTest;
+
   void SetContext(ScreenContext* context);
 
+  ScreenObserver* screen_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(BaseScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_BASE_SCREEN_H_