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

chrome/browser/chromeos/login/login_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 "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm_window.h"
@@ skipping 75 matching lines @@
 class LoginSigninTest : public InProcessBrowserTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitch(switches::kForceLoginManagerInTests);
   }
 
   void TearDownOnMainThread() override {
     // Close the login manager, which otherwise holds a KeepAlive that is not
     // cleared in time by the end of the test.
-    LoginDisplayHost::default_host()->Finalize();
+    LoginDisplayHost::default_host()->Finalize(base::OnceClosure());
   }
 
   void SetUpOnMainThread() override {
     LoginDisplayHostImpl::DisableRestrictiveProxyCheckForTest();
   }
 };
 
 class LoginTest : public LoginManagerTest {
  public:
   LoginTest() : LoginManagerTest(true) {}
@@ skipping 372 matching lines @@
   TestDomainVisible();
 
   fake_auth_policy_client_->set_auth_error(authpolicy::ERROR_BAD_PASSWORD);
   SubmitActiveDirectoryCredentials(kTestActiveDirectoryUser, kPassword);
   WaitForMessage(&message_queue, "\"ShowAuthError\"");
   TestPasswordError();
   TestDomainVisible();
 }
 
 }  // namespace chromeos