Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / users / fake_supervised_user_manager.cc

diff --git a/src/chrome/browser/chromeos/login/users/fake_supervised_user_manager.cc b/src/chrome/browser/chromeos/login/users/fake_supervised_user_manager.cc
index 8fb334f..a70f31b 100644 (file)
--- a/src/chrome/browser/chromeos/login/users/fake_supervised_user_manager.cc
+++ b/src/chrome/browser/chromeos/login/users/fake_supervised_user_manager.cc
@@ -18,7 +18,7 @@ bool FakeSupervisedUserManager::HasSupervisedUsers(
   return false;
 }
 
-const User* FakeSupervisedUserManager::CreateUserRecord(
+const user_manager::User* FakeSupervisedUserManager::CreateUserRecord(
     const std::string& manager_id,
     const std::string& local_user_id,
     const std::string& sync_user_id,
@@ -30,33 +30,33 @@ std::string FakeSupervisedUserManager::GenerateUserId() {
   return std::string();
 }
 
-const User* FakeSupervisedUserManager::FindByDisplayName(
+const user_manager::User* FakeSupervisedUserManager::FindByDisplayName(
     const base::string16& display_name) const {
   return NULL;
 }
 
-const User* FakeSupervisedUserManager::FindBySyncId(
+const user_manager::User* FakeSupervisedUserManager::FindBySyncId(
     const std::string& sync_id) const {
   return NULL;
 }
 
 std::string FakeSupervisedUserManager::GetUserSyncId(
-    const std::string& managed_user_id) const {
+    const std::string& supervised_user_id) const {
   return std::string();
 }
 
 base::string16 FakeSupervisedUserManager::GetManagerDisplayName(
-    const std::string& managed_user_id) const {
+    const std::string& supervised_user_id) const {
   return base::string16();
 }
 
 std::string FakeSupervisedUserManager::GetManagerUserId(
-    const std::string& managed_user_id) const {
+    const std::string& supervised_user_id) const {
   return std::string();
 }
 
 std::string FakeSupervisedUserManager::GetManagerDisplayEmail(
-    const std::string& managed_user_id) const {
+    const std::string& supervised_user_id) const {
   return std::string();
 }