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

chrome/browser/chromeos/login/ui/mock_login_display_host.h

Index: chrome/browser/chromeos/login/ui/mock_login_display_host.h
diff --git a/chrome/browser/chromeos/login/ui/mock_login_display_host.h b/chrome/browser/chromeos/login/ui/mock_login_display_host.h
index 2e36922b9c199a4bc447d46ea242661d2d4b06c1..9bb768de31080c5657ac486083c443c53782a6d4 100644
--- a/chrome/browser/chromeos/login/ui/mock_login_display_host.h
+++ b/chrome/browser/chromeos/login/ui/mock_login_display_host.h
@@ -22,7 +22,13 @@ class MockLoginDisplayHost : public LoginDisplayHost {
   MOCK_CONST_METHOD0(GetOobeUI, OobeUI*(void));
   MOCK_CONST_METHOD0(GetWebUILoginView, WebUILoginView*(void));
   MOCK_METHOD0(BeforeSessionStart, void(void));
-  MOCK_METHOD0(Finalize, void(void));
+
+  // Workaround for move-only args in GMock.
+  MOCK_METHOD1(MockFinalize, void(base::OnceClosure*));
+  void Finalize(base::OnceClosure completion_callback) override {
+    MockFinalize(&completion_callback);
+  }
+
   MOCK_METHOD0(OnCompleteLogin, void(void));
   MOCK_METHOD0(OpenProxySettings, void(void));
   MOCK_METHOD1(SetStatusAreaVisible, void(bool));
@@ -31,7 +37,13 @@ class MockLoginDisplayHost : public LoginDisplayHost {
   MOCK_METHOD1(StartWizard, void(OobeScreen));
   MOCK_METHOD0(GetWizardController, WizardController*(void));
   MOCK_METHOD0(GetAppLaunchController, AppLaunchController*(void));
-  MOCK_METHOD1(StartUserAdding, void(const base::Closure&));
+
+  // Workaround for move-only args in GMock.
+  MOCK_METHOD1(MockStartUserAdding, void(base::OnceClosure*));
+  void StartUserAdding(base::OnceClosure completion_callback) {
+    MockStartUserAdding(&completion_callback);
+  }
+
   MOCK_METHOD0(CancelUserAdding, void(void));
   MOCK_METHOD1(StartSignInScreen, void(const LoginScreenContext&));
   MOCK_METHOD0(ResumeSignInScreen, void(void));