ScreenObserver is renamed to BaseScreenDelegate.

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

 // 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
+#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 34 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture() override {
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
     fake_session_manager_client_ = new FakeSessionManagerClient;
     DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
   }
 
   virtual void SetUpOnMainThread() override {
     WizardInProcessBrowserTest::SetUpOnMainThread();
-    mock_screen_observer_.reset(new MockScreenObserver());
+    mock_base_screen_delegate_.reset(new MockBaseScreenDelegate());
     ASSERT_TRUE(WizardController::default_controller() != NULL);
     network_screen_ =
         NetworkScreen::Get(WizardController::default_controller());
     ASSERT_TRUE(network_screen_ != NULL);
     ASSERT_EQ(WizardController::default_controller()->current_screen(),
               network_screen_);
-    network_screen_->screen_observer_ = mock_screen_observer_.get();
+    network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get();
     ASSERT_TRUE(network_screen_->actor() != NULL);
 
     mock_network_state_helper_ = new login::MockNetworkStateHelper;
     SetDefaultNetworkStateHelperExpectations();
     network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_);
   }
 
   virtual void TearDownInProcessBrowserTestFixture() override {
     InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   void EmulateContinueButtonExit(NetworkScreen* network_screen) {
-    EXPECT_CALL(*mock_screen_observer_,
-                OnExit(ScreenObserver::NETWORK_CONNECTED))
-        .Times(1);
+    EXPECT_CALL(*mock_base_screen_delegate_,
+                OnExit(BaseScreenDelegate::NETWORK_CONNECTED)).Times(1);
     EXPECT_CALL(*mock_network_state_helper_, IsConnected())
         .WillOnce(Return(true));
     network_screen->OnContinuePressed();
     content::RunAllPendingInMessageLoop();
   }
 
   void SetDefaultNetworkStateHelperExpectations() {
     EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName())
         .Times(AnyNumber())
         .WillRepeatedly((Return(base::string16())));
     EXPECT_CALL(*mock_network_state_helper_, IsConnected())
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
     EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
   }
 
-  scoped_ptr<MockScreenObserver> mock_screen_observer_;
+  scoped_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_;
   login::MockNetworkStateHelper* mock_network_state_helper_;
   NetworkScreen* network_screen_;
   FakeSessionManagerClient* fake_session_manager_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {
   EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
@@ skipping 27 matching lines @@
   // EXPECT_FALSE(actor_->IsConnecting());
   network_screen_->OnConnectionTimeout();
 
   // Close infobubble with error message - it makes the test stable.
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   // EXPECT_FALSE(actor_->IsConnecting());
   // actor_->ClearErrors();
 }
 
 }  // namespace chromeos