Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: ios/net/cookies/cookie_store_ios.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/net/cookies/cookie_store_ios.h ('k') | ios/net/cookies/cookie_store_ios_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/net/cookies/cookie_store_ios.mm
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index 78fb510ffa93c837cfc09e8d5f356b20df50ee2c..84e687dca9541c20f6793a21a206c8e0b4152e7b 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -327,7 +327,7 @@ void CookieStoreIOS::SetCookiePolicy(CookiePolicy setting) {
}
// static
-scoped_ptr<CookieStoreIOS> CookieStoreIOS::CreateCookieStore(
+std::unique_ptr<CookieStoreIOS> CookieStoreIOS::CreateCookieStore(
NSHTTPCookieStorage* cookie_storage) {
DCHECK(cookie_storage);
// TODO(huey): Update this when CrNet supports multiple cookie jars.
@@ -335,7 +335,7 @@ scoped_ptr<CookieStoreIOS> CookieStoreIOS::CreateCookieStore(
// Create a cookie store with no persistent store backing. Then, populate
// it from the system's cookie jar.
- scoped_ptr<CookieStoreIOS> cookie_store(
+ std::unique_ptr<CookieStoreIOS> cookie_store(
new CookieStoreIOS(nullptr, cookie_storage));
cookie_store->synchronization_state_ = SYNCHRONIZED;
cookie_store->FlushStore(base::Closure());
@@ -482,11 +482,10 @@ void CookieStoreIOS::SetCookieWithDetailsAsync(
// First create a CanonicalCookie, to normalize the arguments,
// particularly domain and path, and perform validation.
- scoped_ptr<net::CanonicalCookie> canonical_cookie =
+ std::unique_ptr<net::CanonicalCookie> canonical_cookie =
net::CanonicalCookie::Create(
url, name, value, domain, path, creation_time, expiration_time,
- secure, http_only, same_site, enforce_strict_secure,
- priority);
+ secure, http_only, same_site, enforce_strict_secure, priority);
if (canonical_cookie) {
NSHTTPCookie* cookie =
@@ -981,7 +980,7 @@ void CookieStoreIOS::OnSystemCookiesChanged() {
FROM_HERE, flush_closure_.callback(), flush_delay_);
}
-scoped_ptr<net::CookieStore::CookieChangedSubscription>
+std::unique_ptr<net::CookieStore::CookieChangedSubscription>
CookieStoreIOS::AddCallbackForCookie(const GURL& gurl,
const std::string& name,
const CookieChangedCallback& callback) {
« no previous file with comments | « ios/net/cookies/cookie_store_ios.h ('k') | ios/net/cookies/cookie_store_ios_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698