Merge M43: Fix crash on Enrollment screen.

chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.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 "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
@@ skipping 200 matching lines @@
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, PRE_OpenPortalDialog) {
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, OpenPortalDialog) {
   LoginDisplayHostImpl* host =
       static_cast<LoginDisplayHostImpl*>(LoginDisplayHostImpl::default_host());
   ASSERT_TRUE(host);
   OobeUI* oobe = host->GetOobeUI();
   ASSERT_TRUE(oobe);
-  NetworkErrorView* network_error_view = oobe->GetNetworkErrorView();
-  ASSERT_TRUE(network_error_view);
 
   // Error screen asks portal detector to change detection strategy.
-  ErrorScreen error_screen(NULL, network_error_view);
+  ErrorScreen* error_screen = oobe->GetErrorScreen();
+  ASSERT_TRUE(error_screen);
 
   ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());
   network_portal_detector()->NotifyObserversForTesting();
   OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
   ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());
 
-  error_screen.ShowCaptivePortal();
+  error_screen->ShowCaptivePortal();
 }
 
 }  // namespace chromeos