SetHostConfiguration() and ConfigureHost() are moved from ScreenObserver.

chrome/browser/chromeos/login/screens/controller_pairing_screen.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/controller_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 using namespace chromeos::controller_pairing;
 using namespace pairing_chromeos;
 
 namespace chromeos {
 
 ControllerPairingScreen::ControllerPairingScreen(
     ScreenObserver* observer,
     ControllerPairingScreenActor* actor,
     ControllerPairingController* shark_controller)
     : BaseScreen(observer),
       actor_(actor),
       shark_controller_(shark_controller),
+      delegate_(nullptr),
       current_stage_(ControllerPairingController::STAGE_NONE),
       device_preselected_(false) {
   actor_->SetDelegate(this);
   shark_controller_->AddObserver(this);
 }
 
 ControllerPairingScreen::~ControllerPairingScreen() {
   if (actor_)
     actor_->SetDelegate(NULL);
   shark_controller_->RemoveObserver(this);
 }
 
+void ControllerPairingScreen::SetDelegate(Delegate* delegate) {
+  delegate_ = delegate;
+}
+
 void ControllerPairingScreen::CommitContextChanges() {
   if (!context_.HasChanges())
     return;
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
   if (actor_)
     actor_->OnContextChanged(diff);
 }
 
 bool ControllerPairingScreen::ExpectStageIs(Stage stage) const {
@@ skipping 46 matching lines @@
       desired_page = kPageEstablishingConnectionError;
       break;
     }
     case ControllerPairingController::STAGE_WAITING_FOR_CODE_CONFIRMATION: {
       desired_page = kPageCodeConfirmation;
       context_.SetString(kContextKeyConfirmationCode,
                          shark_controller_->GetConfirmationCode());
       break;
     }
     case ControllerPairingController::STAGE_PAIRING_DONE: {
-      get_screen_observer()->SetHostConfiguration();
+      if (delegate_)
+        delegate_->SetHostConfiguration();
       break;
     }
     case ControllerPairingController::STAGE_HOST_UPDATE_IN_PROGRESS: {
       desired_page = kPageHostUpdate;
       break;
     }
     case ControllerPairingController::STAGE_HOST_CONNECTION_LOST: {
       desired_page = kPageHostConnectionLost;
       break;
     }
@@ skipping 95 matching lines @@
        ++key) {
     if (*key == kContextKeySelectedDevice) {
       context_.SetBoolean(kContextKeyControlsDisabled,
                           context_.GetString(*key).empty());
       CommitContextChanges();
     }
   }
 }
 
 }  // namespace chromeos