cros: Fold NetworkErrorModel into NetworkErrorView.

chrome/browser/ui/webui/chromeos/login/oobe_ui.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 "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 261 matching lines @@
       base::MakeUnique<HIDDetectionScreenHandler>(core_handler_);
   hid_detection_view_ = hid_detection_screen_handler.get();
   AddScreenHandler(std::move(hid_detection_screen_handler));
 
   auto error_screen_handler = base::MakeUnique<ErrorScreenHandler>();
   error_screen_handler_ = error_screen_handler.get();
   AddScreenHandler(std::move(error_screen_handler));
   network_dropdown_handler_->AddObserver(error_screen_handler_);
 
   error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_));
-  NetworkErrorModel* network_error_model = error_screen_.get();
+  ErrorScreen* error_screen = error_screen_.get();
 
   auto enrollment_screen_handler = base::MakeUnique<EnrollmentScreenHandler>(
-      network_state_informer_, network_error_model);
+      network_state_informer_, error_screen);
   enrollment_screen_actor_ = enrollment_screen_handler.get();
   AddScreenHandler(std::move(enrollment_screen_handler));
 
   auto terms_of_service_screen_handler =
       base::MakeUnique<TermsOfServiceScreenHandler>(core_handler_);
   terms_of_service_screen_actor_ = terms_of_service_screen_handler.get();
   AddScreenHandler(std::move(terms_of_service_screen_handler));
 
   auto arc_terms_of_service_screen_handler =
       base::MakeUnique<ArcTermsOfServiceScreenHandler>();
   arc_terms_of_service_screen_actor_ =
       arc_terms_of_service_screen_handler.get();
   AddScreenHandler(std::move(arc_terms_of_service_screen_handler));
 
   auto user_image_screen_handler = base::MakeUnique<UserImageScreenHandler>();
   user_image_view_ = user_image_screen_handler.get();
   AddScreenHandler(std::move(user_image_screen_handler));
 
   auto user_board_screen_handler = base::MakeUnique<UserBoardScreenHandler>();
   user_board_screen_handler_ = user_board_screen_handler.get();
   AddScreenHandler(std::move(user_board_screen_handler));
 
   auto gaia_screen_handler = base::MakeUnique<GaiaScreenHandler>(
       core_handler_, network_state_informer_);
   gaia_screen_handler_ = gaia_screen_handler.get();
   AddScreenHandler(std::move(gaia_screen_handler));
 
   auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>(
-      network_state_informer_, network_error_model, core_handler_,
+      network_state_informer_, error_screen, core_handler_,
       gaia_screen_handler_);
   signin_screen_handler_ = signin_screen_handler.get();
   AddScreenHandler(std::move(signin_screen_handler));
 
   auto app_launch_splash_screen_handler =
       base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_,
-                                                     network_error_model);
+                                                     error_screen);
   app_launch_splash_screen_actor_ = app_launch_splash_screen_handler.get();
   AddScreenHandler(std::move(app_launch_splash_screen_handler));
 
   if (display_type_ == kOobeDisplay) {
     auto controller_pairing_handler =
         base::MakeUnique<ControllerPairingScreenHandler>();
     controller_pairing_screen_actor_ = controller_pairing_handler.get();
     AddScreenHandler(std::move(controller_pairing_handler));
 
     auto host_pairing_handler = base::MakeUnique<HostPairingScreenHandler>();
@@ skipping 294 matching lines @@
       g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
     return;
   }
 
   base::DictionaryValue localized_strings;
   GetLocalizedStrings(&localized_strings);
   static_cast<CoreOobeActor*>(core_handler_)->ReloadContent(localized_strings);
 }
 
 }  // namespace chromeos