BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 26 insertions, 18 deletions

diff --git a/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc b/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
index 0f449f31348..1b0604b446b 100644
--- a/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chromium/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -396,26 +396,34 @@ void CookiesSetFunction::SetCookieOnIOThread() {
   }
 
   // clang-format off
-  cookie_store->SetCookieWithDetailsAsync(
-      url_, parsed_args_->details.name.get() ? *parsed_args_->details.name
+  std::unique_ptr<net::CanonicalCookie> cc(
+      net::CanonicalCookie::CreateSanitizedCookie(
+          url_, parsed_args_->details.name.get() ? *parsed_args_->details.name
+                                                 : std::string(),
+          parsed_args_->details.value.get() ? *parsed_args_->details.value
+                                                 : std::string(),
+          parsed_args_->details.domain.get() ? *parsed_args_->details.domain
                                              : std::string(),
-      parsed_args_->details.value.get() ? *parsed_args_->details.value
-                                        : std::string(),
-      parsed_args_->details.domain.get() ? *parsed_args_->details.domain
-                                         : std::string(),
-      parsed_args_->details.path.get() ? *parsed_args_->details.path
-                                       : std::string(),
-      base::Time(),
-      expiration_time,
-      base::Time(),
-      parsed_args_->details.secure.get() ? *parsed_args_->details.secure
-                                         : false,
-      parsed_args_->details.http_only.get() ? *parsed_args_->details.http_only
-                                            : false,
-      same_site,
-      net::COOKIE_PRIORITY_DEFAULT,
-      base::BindOnce(&CookiesSetFunction::PullCookie, this));
+          parsed_args_->details.path.get() ? *parsed_args_->details.path
+                                           : std::string(),
+          base::Time(),
+          expiration_time,
+          base::Time(),
+          parsed_args_->details.secure.get() ? *parsed_args_->details.secure
+                                             : false,
+          parsed_args_->details.http_only.get() ?
+              *parsed_args_->details.http_only :
+              false,
+          same_site,
+          net::COOKIE_PRIORITY_DEFAULT));
   // clang-format on
+  if (!cc) {
+    PullCookie(false);
+    return;
+  }
+  cookie_store->SetCanonicalCookieAsync(
+      std::move(cc), url_.SchemeIsCryptographic(), true /*modify_http_only*/,
+      base::BindOnce(&CookiesSetFunction::PullCookie, this));
 }
 
 void CookiesSetFunction::PullCookie(bool set_cookie_result) {