ScreenObserver is renamed to BaseScreenDelegate.

chrome/browser/chromeos/login/screens/device_disabled_screen_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/browser_process_platform_part.h"
+#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace chromeos {
 
 namespace {
 
 const char kDisabledMessage[] = "Device disabled.";
 
 }
 
-class DeviceDisabledScreenTest : public testing::Test, public ScreenObserver {
+class DeviceDisabledScreenTest : public testing::Test,
+                                 public BaseScreenDelegate {
  public:
   DeviceDisabledScreenTest();
   ~DeviceDisabledScreenTest() override;
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
-  // ScreenObserver:
+  // BaseScreenDelegate:
   MOCK_METHOD1(OnExit, void(ExitCodes));
   void ShowCurrentScreen() override;
   ErrorScreen* GetErrorScreen() override;
   void ShowErrorScreen() override;
   void HideErrorScreen(BaseScreen* parent_screen) override;
 
   void SetDeviceDisabled(bool disabled);
   void SetDeviceMode(policy::DeviceMode device_mode);
 
   void ExpectScreenToNotShow();
@@ skipping 52 matching lines @@
 
 void DeviceDisabledScreenTest::SetDeviceMode(policy::DeviceMode device_mode) {
   reinterpret_cast<policy::StubEnterpriseInstallAttributes*>(
       TestingBrowserProcess::GetGlobal()->platform_part()->
           browser_policy_connector_chromeos()->GetInstallAttributes())->
               SetMode(device_mode);
 }
 
 void DeviceDisabledScreenTest::ExpectScreenToNotShow() {
   EXPECT_CALL(*actor_, Show(_)).Times(0);
-  EXPECT_CALL(*this, OnExit(ScreenObserver::DEVICE_NOT_DISABLED)).Times(1);
+  EXPECT_CALL(*this, OnExit(BaseScreenDelegate::DEVICE_NOT_DISABLED)).Times(1);
 }
 
 void DeviceDisabledScreenTest::ExpectScreenToShow() {
   EXPECT_CALL(*actor_, Show(kDisabledMessage)).Times(1);
-  EXPECT_CALL(*this, OnExit(ScreenObserver::DEVICE_NOT_DISABLED)).Times(0);
+  EXPECT_CALL(*this, OnExit(BaseScreenDelegate::DEVICE_NOT_DISABLED)).Times(0);
 }
 
 void DeviceDisabledScreenTest::TryToShowScreen() {
   screen_->Show();
 }
 
 // Verifies that the device disabled screen is not shown by default.
 TEST_F(DeviceDisabledScreenTest, DoNotShowByDefault) {
   ExpectScreenToNotShow();
   TryToShowScreen();
@@ skipping 38 matching lines @@
 // Verifies that the device disabled screen is shown when the device is marked
 // as disabled, device disabling is not turned off by flag and the device is not
 // owned yet.
 TEST_F(DeviceDisabledScreenTest, ShowWhenDisabledAndNotOwned) {
   SetDeviceDisabled(true);
   ExpectScreenToShow();
   TryToShowScreen();
 }
 
 }  // namespace chromeos