| Index: net/cookies/canonical_cookie.h
|
| diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
|
| index f95501c7627917833994894b43fd2c24da87da59..254e1173574432888a62caa3f4f74a84ae36fe37 100644
|
| --- a/net/cookies/canonical_cookie.h
|
| +++ b/net/cookies/canonical_cookie.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef NET_COOKIES_CANONICAL_COOKIE_H_
|
| #define NET_COOKIES_CANONICAL_COOKIE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "net/base/net_export.h"
|
| #include "net/cookies/cookie_constants.h"
|
| @@ -50,26 +50,27 @@ class NET_EXPORT CanonicalCookie {
|
| // Creates a new |CanonicalCookie| from the |cookie_line| and the
|
| // |creation_time|. Canonicalizes and validates inputs. May return NULL if
|
| // an attribute value is invalid.
|
| - static scoped_ptr<CanonicalCookie> Create(const GURL& url,
|
| - const std::string& cookie_line,
|
| - const base::Time& creation_time,
|
| - const CookieOptions& options);
|
| + static std::unique_ptr<CanonicalCookie> Create(
|
| + const GURL& url,
|
| + const std::string& cookie_line,
|
| + const base::Time& creation_time,
|
| + const CookieOptions& options);
|
|
|
| // Creates a canonical cookie from unparsed attribute values.
|
| // Canonicalizes and validates inputs. May return NULL if an attribute
|
| // value is invalid.
|
| - static scoped_ptr<CanonicalCookie> Create(const GURL& url,
|
| - const std::string& name,
|
| - const std::string& value,
|
| - const std::string& domain,
|
| - const std::string& path,
|
| - const base::Time& creation,
|
| - const base::Time& expiration,
|
| - bool secure,
|
| - bool http_only,
|
| - CookieSameSite same_site,
|
| - bool enforce_strict_secure,
|
| - CookiePriority priority);
|
| + static std::unique_ptr<CanonicalCookie> Create(const GURL& url,
|
| + const std::string& name,
|
| + const std::string& value,
|
| + const std::string& domain,
|
| + const std::string& path,
|
| + const base::Time& creation,
|
| + const base::Time& expiration,
|
| + bool secure,
|
| + bool http_only,
|
| + CookieSameSite same_site,
|
| + bool enforce_strict_secure,
|
| + CookiePriority priority);
|
|
|
| const GURL& Source() const { return source_; }
|
| const std::string& Name() const { return name_; }
|
|
|