| Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| index 89a2508e76f51c30ef1e02d30af52a10d77c9cc0..51ceec09ead2b5c0e47c16d96e6f289e9838f8b6 100644
|
| --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| @@ -7,7 +7,6 @@
|
| #include <keyhi.h>
|
| #include <stdint.h>
|
|
|
| -#include <algorithm>
|
| #include <memory>
|
| #include <string>
|
| #include <utility>
|
| @@ -17,6 +16,7 @@
|
| #include "base/callback.h"
|
| #include "base/command_line.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/stl_util.h"
|
| #include "base/task_scheduler/post_task.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/threading/thread_checker.h"
|
| @@ -421,11 +421,8 @@ void OwnerSettingsServiceChromeOS::FixupLocalOwnerPolicy(
|
| settings->mutable_allow_new_users()->set_allow_new_users(true);
|
|
|
| em::UserWhitelistProto* whitelist_proto = settings->mutable_user_whitelist();
|
| - if (whitelist_proto->user_whitelist().end() ==
|
| - std::find(whitelist_proto->user_whitelist().begin(),
|
| - whitelist_proto->user_whitelist().end(), user_id)) {
|
| + if (!base::ContainsValue(whitelist_proto->user_whitelist(), user_id))
|
| whitelist_proto->add_user_whitelist(user_id);
|
| - }
|
| }
|
|
|
| // static
|
|
|