| Index: chrome/browser/chromeos/login/users/scoped_test_user_manager.h
|
| diff --git a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h b/chrome/browser/chromeos/login/users/scoped_test_user_manager.h
|
| similarity index 32%
|
| copy from chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h
|
| copy to chrome/browser/chromeos/login/users/scoped_test_user_manager.h
|
| index 20d60586daa1ef5f3dd9989a8109059a320a30c7..ec07d2cdc6a66c9586403b8bcfdb5148daee69e4 100644
|
| --- a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h
|
| +++ b/chrome/browser/chromeos/login/users/scoped_test_user_manager.h
|
| @@ -2,28 +2,29 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_LOGIN_OOBE_SESSION_MANAGER_DELEGATE_H_
|
| -#define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_LOGIN_OOBE_SESSION_MANAGER_DELEGATE_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
|
| +#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "components/session_manager/core/session_manager.h"
|
|
|
| namespace chromeos {
|
|
|
| -class LoginOobeSessionManagerDelegate
|
| - : public session_manager::SessionManagerDelegate {
|
| +class ChromeUserManager;
|
| +
|
| +// Helper class for unit tests. Initializes the UserManager singleton on
|
| +// construction and tears it down again on destruction.
|
| +class ScopedTestUserManager {
|
| public:
|
| - LoginOobeSessionManagerDelegate();
|
| - virtual ~LoginOobeSessionManagerDelegate();
|
| + ScopedTestUserManager();
|
| + ~ScopedTestUserManager();
|
|
|
| private:
|
| - // session_manager::SessionManagerDelegate implementation:
|
| - virtual void Start() OVERRIDE;
|
| + scoped_ptr<ChromeUserManager> chrome_user_manager_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(LoginOobeSessionManagerDelegate);
|
| + DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
|
| };
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_LOGIN_OOBE_SESSION_MANAGER_DELEGATE_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
|
|
|