Use CanonicalCookie::FromStorage in

SQLitePersistentCookieStore::Backend::MakeCookiesFromSQLStatement.

This factory method is used when creating a CanonicalCookie from a
cookie that has already entered the user agent storage model.

Bug: 1102874
Change-Id: Ie6792b0348a40edb760e7da0192e4879952c415a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495802Reviewed-by: Maksim Orlovich <morlovich@chromium.org>
Reviewed-by: Lily Chen <chlily@chromium.org>
Commit-Queue: Dylan Cutler <dylancutler@google.com>
Cr-Commit-Position: refs/heads/master@{#820843}

net/extras/sqlite/sqlite_persistent_cookie_store.cc

@@ -944,7 +944,8 @@ bool SQLitePersistentCookieStore::Backend::MakeCookiesFromSQLStatement(
     } else {
       value = smt.ColumnString(3);
     }
-    std::unique_ptr<CanonicalCookie> cc(std::make_unique<CanonicalCookie>(
+    // Returns nullptr if the resulting cookie is not canonical.
+    std::unique_ptr<net::CanonicalCookie> cc = CanonicalCookie::FromStorage(
         smt.ColumnString(2),                           // name
         value,                                         // value
         smt.ColumnString(1),                           // domain
@@ -958,10 +959,10 @@ bool SQLitePersistentCookieStore::Backend::MakeCookiesFromSQLStatement(
             static_cast<DBCookieSameSite>(smt.ColumnInt(9))),  // samesite
         DBCookiePriorityToCookiePriority(
             static_cast<DBCookiePriority>(smt.ColumnInt(13))),  // priority
-        DBToCookieSourceScheme(smt.ColumnInt(14))));            // source_scheme
-    DLOG_IF(WARNING, cc->CreationDate() > Time::Now())
-        << L"CreationDate too recent";
-    if (cc->IsCanonical()) {
+        DBToCookieSourceScheme(smt.ColumnInt(14)));             // source_scheme
+    if (cc) {
+      DLOG_IF(WARNING, cc->CreationDate() > Time::Now())
+          << L"CreationDate too recent";
       cookies->push_back(std::move(cc));
     } else {
       RecordCookieLoadProblem(COOKIE_LOAD_PROBLEM_NON_CANONICAL);