BASELINE: Update Chromium to 100.0.4896.167

Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 10 insertions, 9 deletions

diff --git a/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc b/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
index 54de40c46de..f30e82d97b9 100644
--- a/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -119,16 +119,16 @@ void CookiesEventRouter::OnCookieChange(bool otr,
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
-  dict->SetBoolean(cookies_api_constants::kRemovedKey,
-                   change.cause != net::CookieChangeCause::INSERTED);
+  base::Value dict(base::Value::Type::DICTIONARY);
+  dict.SetBoolKey(cookies_api_constants::kRemovedKey,
+                  change.cause != net::CookieChangeCause::INSERTED);
 
   Profile* profile =
       otr ? profile_->GetPrimaryOTRProfile(/*create_if_needed=*/true)
           : profile_->GetOriginalProfile();
   api::cookies::Cookie cookie = cookies_helpers::CreateCookie(
       change.cookie, cookies_helpers::GetStoreIdFromProfile(profile));
-  dict->Set(cookies_api_constants::kCookieKey, cookie.ToValue());
+  dict.SetKey(cookies_api_constants::kCookieKey, std::move(*cookie.ToValue()));
 
   // Map the internal cause to an external string.
   std::string cause_dict_entry;
@@ -159,7 +159,7 @@ void CookiesEventRouter::OnCookieChange(bool otr,
     case net::CookieChangeCause::UNKNOWN_DELETION:
       NOTREACHED();
   }
-  dict->SetString(cookies_api_constants::kCauseKey, cause_dict_entry);
+  dict.SetStringKey(cookies_api_constants::kCauseKey, cause_dict_entry);
 
   args->Append(std::move(dict));
 
@@ -225,7 +225,8 @@ void CookiesEventRouter::DispatchEvent(
   if (!router)
     return;
   auto event = std::make_unique<Event>(
-      histogram_value, event_name, std::move(*event_args).TakeList(), context);
+      histogram_value, event_name, std::move(*event_args).TakeListDeprecated(),
+      context);
   event->event_url = cookie_domain;
   router->BroadcastEvent(std::move(event));
 }
@@ -577,12 +578,12 @@ ExtensionFunction::ResponseAction CookiesGetAllCookieStoresFunction::Run() {
   }
   // Return a list of all cookie stores with at least one open tab.
   std::vector<api::cookies::CookieStore> cookie_stores;
-  if (original_tab_ids->GetList().size() > 0) {
+  if (original_tab_ids->GetListDeprecated().size() > 0) {
     cookie_stores.push_back(cookies_helpers::CreateCookieStore(
         original_profile, std::move(original_tab_ids)));
   }
-  if (incognito_tab_ids.get() && incognito_tab_ids->GetList().size() > 0 &&
-      incognito_profile) {
+  if (incognito_tab_ids.get() &&
+      incognito_tab_ids->GetListDeprecated().size() > 0 && incognito_profile) {
     cookie_stores.push_back(cookies_helpers::CreateCookieStore(
         incognito_profile, std::move(incognito_tab_ids)));
   }