From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 12 Oct 2020 14:27:29 +0200
Subject: BASELINE: Update Chromium to 85.0.4183.140

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/components/user_manager/BUILD.gn             |  1 +
 chromium/components/user_manager/fake_user_manager.cc |  9 +++++++--
 chromium/components/user_manager/fake_user_manager.h  | 11 +++++++++++
 chromium/components/user_manager/known_user.cc        | 19 +++++++++----------
 .../components/user_manager/user_image/user_image.cc  |  1 +
 5 files changed, 29 insertions(+), 12 deletions(-)

(limited to 'chromium/components/user_manager')

diff --git a/chromium/components/user_manager/BUILD.gn b/chromium/components/user_manager/BUILD.gn
index c4b12fd010b..66e1c5e36e7 100644
--- a/chromium/components/user_manager/BUILD.gn
+++ b/chromium/components/user_manager/BUILD.gn
@@ -16,6 +16,7 @@ component("user_manager") {
 
   public_deps = [
     "//base",
+    "//base/util/values:values_util",
     "//components/account_id",
     "//ui/gfx",
   ]
diff --git a/chromium/components/user_manager/fake_user_manager.cc b/chromium/components/user_manager/fake_user_manager.cc
index a1ecbc1f697..875a6583f2f 100644
--- a/chromium/components/user_manager/fake_user_manager.cc
+++ b/chromium/components/user_manager/fake_user_manager.cc
@@ -120,6 +120,11 @@ void FakeUserManager::UpdateUserAccountData(
   }
 }
 
+void FakeUserManager::LogoutAllUsers() {
+  primary_user_ = nullptr;
+  active_user_ = nullptr;
+}
+
 void FakeUserManager::UserLoggedIn(const AccountId& account_id,
                                    const std::string& username_hash,
                                    bool browser_restart,
@@ -230,11 +235,11 @@ base::string16 FakeUserManager::GetUserDisplayName(
 }
 
 bool FakeUserManager::IsCurrentUserOwner() const {
-  return false;
+  return is_current_user_owner_;
 }
 
 bool FakeUserManager::IsCurrentUserNew() const {
-  return false;
+  return is_current_user_new_;
 }
 
 bool FakeUserManager::IsCurrentUserNonCryptohomeDataEphemeral() const {
diff --git a/chromium/components/user_manager/fake_user_manager.h b/chromium/components/user_manager/fake_user_manager.h
index 1641beeb7a2..3a2b7969490 100644
--- a/chromium/components/user_manager/fake_user_manager.h
+++ b/chromium/components/user_manager/fake_user_manager.h
@@ -39,7 +39,15 @@ class USER_MANAGER_EXPORT FakeUserManager : public UserManagerBase {
   virtual const user_manager::User* AddPublicAccountUser(
       const AccountId& account_id);
 
+  void LogoutAllUsers();
+
   void set_local_state(PrefService* local_state) { local_state_ = local_state; }
+  void set_is_current_user_new(bool is_current_user_new) {
+    is_current_user_new_ = is_current_user_new;
+  }
+  void set_is_current_user_owner(bool is_current_user_owner) {
+    is_current_user_owner_ = is_current_user_owner;
+  }
 
   // UserManager overrides.
   const UserList& GetUsers() const override;
@@ -170,6 +178,9 @@ class USER_MANAGER_EXPORT FakeUserManager : public UserManagerBase {
   // stub. Always empty.
   gfx::ImageSkia empty_image_;
 
+  bool is_current_user_owner_ = false;
+  bool is_current_user_new_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(FakeUserManager);
 };
 
diff --git a/chromium/components/user_manager/known_user.cc b/chromium/components/user_manager/known_user.cc
index 9b6fb00a63d..982399dc669 100644
--- a/chromium/components/user_manager/known_user.cc
+++ b/chromium/components/user_manager/known_user.cc
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
-#include "base/value_conversions.h"
+#include "base/util/values/values_util.h"
 #include "base/values.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ -625,33 +625,32 @@ base::Value GetChallengeResponseKeys(const AccountId& account_id) {
 }
 
 void SetLastOnlineSignin(const AccountId& account_id, base::Time time) {
-  SetPref(account_id, kLastOnlineSignin, base::CreateTimeValue(time));
+  SetPref(account_id, kLastOnlineSignin, util::TimeToValue(time));
 }
 
 base::Time GetLastOnlineSignin(const AccountId& account_id) {
   const base::Value* value = nullptr;
-  base::Time time = base::Time();
   if (!GetPref(account_id, kLastOnlineSignin, &value))
     return base::Time();
-  if (!base::GetValueAsTime(*value, &time))
+  base::Optional<base::Time> time = util::ValueToTime(value);
+  if (!time)
     return base::Time();
-  return time;
+  return *time;
 }
 
 void SetOfflineSigninLimit(const AccountId& account_id,
                            base::TimeDelta time_delta) {
-  SetPref(account_id, kOfflineSigninLimit,
-          base::CreateTimeDeltaValue(time_delta));
+  SetPref(account_id, kOfflineSigninLimit, util::TimeDeltaToValue(time_delta));
 }
 
 base::TimeDelta GetOfflineSigninLimit(const AccountId& account_id) {
   const base::Value* value = nullptr;
-  base::TimeDelta time_delta = base::TimeDelta();
   if (!GetPref(account_id, kOfflineSigninLimit, &value))
     return base::TimeDelta();
-  if (!GetValueAsTimeDelta(*value, &time_delta))
+  base::Optional<base::TimeDelta> time_delta = util::ValueToTimeDelta(value);
+  if (!time_delta)
     return base::TimeDelta();
-  return time_delta;
+  return *time_delta;
 }
 
 void SetIsEnterpriseManaged(const AccountId& account_id,
diff --git a/chromium/components/user_manager/user_image/user_image.cc b/chromium/components/user_manager/user_image/user_image.cc
index 050f2f011e0..90de2548029 100644
--- a/chromium/components/user_manager/user_image/user_image.cc
+++ b/chromium/components/user_manager/user_image/user_image.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
-- 
cgit v1.2.1