Shifted creation of unvalidated CanonicalCookies over to a constructor.

net/cookies/cookie_monster_store_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cookies/cookie_monster_store_test.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 112 matching lines @@
   // This helper is simplistic in interpreting a parsed cookie, in order to
   // avoid duplicated CookieMonster's CanonPath() and CanonExpiration()
   // functions. Would be nice to export them, and re-use here.
   EXPECT_FALSE(pc.HasMaxAge());
   EXPECT_TRUE(pc.HasPath());
   base::Time cookie_expires =
       pc.HasExpires() ? cookie_util::ParseCookieExpirationTime(pc.Expires())
                       : base::Time();
   std::string cookie_path = pc.Path();
 
-  return CanonicalCookie::Create(pc.Name(), pc.Value(), "." + url.host(),
-                                 cookie_path, creation_time, cookie_expires,
-                                 base::Time(), pc.IsSecure(), pc.IsHttpOnly(),
-                                 pc.SameSite(), pc.Priority());
+  return base::MakeUnique<CanonicalCookie>(
+      pc.Name(), pc.Value(), "." + url.host(), cookie_path, creation_time,
+      cookie_expires, base::Time(), pc.IsSecure(), pc.IsHttpOnly(),
+      pc.SameSite(), pc.Priority());
 }
 
 void AddCookieToList(const GURL& url,
                      const std::string& cookie_line,
                      const base::Time& creation_time,
                      std::vector<std::unique_ptr<CanonicalCookie>>* out_list) {
   std::unique_ptr<CanonicalCookie> cookie(
       BuildCanonicalCookie(url, cookie_line, creation_time));
 
   out_list->push_back(std::move(cookie));
@@ skipping 84 matching lines @@
         past_creation + base::TimeDelta::FromMicroseconds(i);
     base::Time expiration_time = current + base::TimeDelta::FromDays(30);
     base::Time last_access_time =
         ((i - base) < num_old_cookies)
             ? current - base::TimeDelta::FromDays(days_old)
             : current;
 
     // The URL must be HTTPS since |secure| can be true or false, and because
     // strict secure cookies are enforced, the cookie will fail to be created if
     // |secure| is true but the URL is an insecure scheme.
-    std::unique_ptr<CanonicalCookie> cc(CanonicalCookie::Create(
+    std::unique_ptr<CanonicalCookie> cc(base::MakeUnique<CanonicalCookie>(
         "a", "1", base::StringPrintf("h%05d.izzle", i), "/path", creation_time,
         expiration_time, base::Time(), secure, false,
         CookieSameSite::DEFAULT_MODE, COOKIE_PRIORITY_DEFAULT));
     cc->SetLastAccessDate(last_access_time);
     store->AddCookie(*cc);
   }
 
   return base::MakeUnique<CookieMonster>(store.get(), nullptr);
 }
 
 MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {
 }
 
 }  // namespace net