Disabled ARC for ephemeral users.

components/user_manager/fake_user_manager.cc

 // Copyright 2014 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 "components/user_manager/fake_user_manager.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
@@ skipping 41 matching lines @@
   return user;
 }
 
 void FakeUserManager::RemoveUserFromList(const AccountId& account_id) {
   user_manager::UserList::iterator it = users_.begin();
   // TODO (alemate): Chenge this to GetAccountId(), once a real AccountId is
   // passed. crbug.com/546876
   while (it != users_.end() && (*it)->GetEmail() != account_id.GetUserEmail())
     ++it;
   if (it != users_.end()) {
-    delete *it;
+    if (active_user_ != *it)
+      delete *it;
     users_.erase(it);
   }
 }
 
 const user_manager::UserList& FakeUserManager::GetUsers() const {
   return users_;
 }
 
 user_manager::UserList FakeUserManager::GetUsersAllowedForMultiProfile() const {
   user_manager::UserList result;
@@ skipping 21 matching lines @@
       logged_in_users_.push_back(*it);
 
       if (!primary_user_)
         primary_user_ = *it;
       break;
     }
   }
 }
 
 user_manager::User* FakeUserManager::GetActiveUserInternal() const {
+  if (active_user_ != nullptr)
+    return active_user_;
+
   if (!users_.empty()) {
     if (active_account_id_.is_valid()) {
       for (user_manager::UserList::const_iterator it = users_.begin();
            it != users_.end(); ++it) {
         if ((*it)->GetAccountId() == active_account_id_)
           return *it;
       }
     }
     return users_[0];
   }
@@ skipping 34 matching lines @@
 const AccountId& FakeUserManager::GetOwnerAccountId() const {
   return owner_account_id_;
 }
 
 bool FakeUserManager::IsKnownUser(const AccountId& account_id) const {
   return true;
 }
 
 const user_manager::User* FakeUserManager::FindUser(
     const AccountId& account_id) const {
+  if (active_user_ != nullptr && active_user_->GetAccountId() == account_id)
+    return active_user_;
+
   const user_manager::UserList& users = GetUsers();
   for (user_manager::UserList::const_iterator it = users.begin();
        it != users.end(); ++it) {
-    // TODO (alemate): Chenge this to GetAccountId(), once a real AccountId is
-    // passed. crbug.com/546876
-    if ((*it)->GetEmail() == account_id.GetUserEmail())
+    if ((*it)->GetAccountId() == account_id)
       return *it;
   }
+
   return nullptr;
 }
 
 user_manager::User* FakeUserManager::FindUserAndModify(
     const AccountId& account_id) {
   return nullptr;
 }
 
 const user_manager::User* FakeUserManager::GetLoggedInUser() const {
   return nullptr;
@@ skipping 88 matching lines @@
 
 PrefService* FakeUserManager::GetLocalState() const {
   return nullptr;
 }
 
 bool FakeUserManager::IsEnterpriseManaged() const {
   return false;
 }
 
 bool FakeUserManager::IsDemoApp(const AccountId& account_id) const {
-  return false;
+  return account_id == chromeos::login::DemoAccountId();
 }
 
 bool FakeUserManager::IsDeviceLocalAccountMarkedForRemoval(
     const AccountId& account_id) const {
   return false;
 }
 
 void FakeUserManager::UpdateLoginState(const user_manager::User* active_user,
                                        const user_manager::User* primary_user,
                                        bool is_current_user_owner) const {}
@@ skipping 60 matching lines @@
   NOTIMPLEMENTED();
   return;
 }
 
 bool FakeUserManager::IsValidDefaultUserImageId(int image_index) const {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace user_manager