Shifted creation of unvalidated CanonicalCookies over to a constructor.

ios/net/cookies/system_cookie_util_unittest.mm

 // Copyright 2014 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 "ios/net/cookies/system_cookie_util.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/time/time.h"
 #include "net/cookies/cookie_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "url/gurl.h"
 
 namespace net {
 
 namespace {
 
 const char kCookieDomain[] = "domain";
 const char kCookieName[] = "name";
 const char kCookiePath[] = "path/";
 const char kCookieValue[] = "value";
 const char kCookieValueInvalidUtf8[] = "\x81r\xe4\xbd\xa0\xe5\xa5\xbd";
 
 void CheckSystemCookie(const base::Time& expires, bool secure, bool httponly) {
   // Generate a canonical cookie.
-  net::CanonicalCookie canonical_cookie = *net::CanonicalCookie::Create(
+  net::CanonicalCookie canonical_cookie(
       kCookieName, kCookieValue, kCookieDomain, kCookiePath,
       base::Time(),  // creation
       expires,
       base::Time(),  // last_access
       secure, httponly, net::CookieSameSite::DEFAULT_MODE,
       net::COOKIE_PRIORITY_DEFAULT);
   // Convert it to system cookie.
   base::scoped_nsobject<NSHTTPCookie> system_cookie(
       [SystemCookieFromCanonicalCookie(canonical_cookie) retain]);
 
@@ skipping 69 matching lines @@
 
   // Test various combinations of session, secure and httponly attributes.
   CheckSystemCookie(expire_date, false, false);
   CheckSystemCookie(base::Time(), true, false);
   CheckSystemCookie(expire_date, false, true);
   CheckSystemCookie(base::Time(), true, true);
 }
 
 TEST(CookieUtil, SystemCookieFromBadCanonicalCookie) {
   // Generate a bad canonical cookie (value is invalid utf8).
-  net::CanonicalCookie bad_canonical_cookie = *net::CanonicalCookie::Create(
+  net::CanonicalCookie bad_canonical_cookie(
       kCookieName, kCookieValueInvalidUtf8, kCookieDomain, kCookiePath,
       base::Time(),  // creation
       base::Time(),  // expires
       base::Time(),  // last_access
       false,         // secure
       false,         // httponly
       net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT);
   // Convert it to system cookie.
   base::scoped_nsobject<NSHTTPCookie> system_cookie(
       [SystemCookieFromCanonicalCookie(bad_canonical_cookie) retain]);
   EXPECT_TRUE(system_cookie == nil);
 }
 
 }  // namespace net