Merge "cros: Move wallpaper after login screen is gone"

chrome/browser/chromeos/login/existing_user_controller_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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 422 matching lines @@
 
     // Test case may be configured with the real user manager but empty user
     // list initially. So network OOBE screen is initialized.
     // Need to reset it manually so that we don't end up with CrosSettings
     // observer that wasn't removed.
     WizardController* controller = WizardController::default_controller();
     if (controller && controller->current_screen())
       controller->current_screen()->Hide();
 
     if (LoginDisplayHost::default_host())
-      LoginDisplayHost::default_host()->Finalize();
+      LoginDisplayHost::default_host()->Finalize(base::OnceClosure());
     base::RunLoop().RunUntilIdle();
   }
 
   void ExpectSuccessfulLogin(const UserContext& user_context) {
     test::UserSessionManagerTestApi session_manager_test_api(
         UserSessionManager::GetInstance());
     session_manager_test_api.InjectStubUserContext(user_context);
     EXPECT_CALL(*mock_login_display_host_,
                 StartWizard(OobeScreen::SCREEN_TERMS_OF_SERVICE))
         .Times(0);
@@ skipping 384 matching lines @@
                        GAIAAccountLogin_Failure) {
   ExpectLoginFailure();
   EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin()).Times(1);
   UserContext user_context(gaia_account_id_);
   user_context.SetKey(Key(kPassword));
   user_context.SetUserIDHash(gaia_account_id_.GetUserEmail());
   existing_user_controller()->CompleteLogin(user_context);
 }
 
 }  // namespace chromeos