| Index: chrome/browser/chromeos/login/users/fake_supervised_user_manager.h
|
| diff --git a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h
|
| index d1b7a887af6e8356031379c64f660a3016014a22..e913ad5525d64e806d6a879ad5f378ed62d3c34d 100644
|
| --- a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h
|
| +++ b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h
|
| @@ -18,15 +18,16 @@ class FakeSupervisedUserManager : public SupervisedUserManager {
|
| virtual ~FakeSupervisedUserManager();
|
|
|
| virtual bool HasSupervisedUsers(const std::string& manager_id) const OVERRIDE;
|
| - virtual const User* CreateUserRecord(
|
| + virtual const user_manager::User* CreateUserRecord(
|
| const std::string& manager_id,
|
| const std::string& local_user_id,
|
| const std::string& sync_user_id,
|
| const base::string16& display_name) OVERRIDE;
|
| virtual std::string GenerateUserId() OVERRIDE;
|
| - virtual const User* FindByDisplayName(const base::string16& display_name)
|
| - const OVERRIDE;
|
| - virtual const User* FindBySyncId(const std::string& sync_id) const OVERRIDE;
|
| + virtual const user_manager::User* FindByDisplayName(
|
| + const base::string16& display_name) const OVERRIDE;
|
| + virtual const user_manager::User* FindBySyncId(
|
| + const std::string& sync_id) const OVERRIDE;
|
| virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE;
|
| virtual base::string16 GetManagerDisplayName(const std::string& user_id) const
|
| OVERRIDE;
|
|
|