| 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 c34383b99c7f0c8ce05d16d32ce3ed414375552d..6da4c3869016f9cdba173dd616ae7192d2a049b9 100644
|
| --- a/ios/net/cookies/cookie_store_ios.mm
|
| +++ b/ios/net/cookies/cookie_store_ios.mm
|
| @@ -287,25 +287,6 @@ CookieStoreIOS::CookieStoreIOS(
|
| [NSHTTPCookieStorage sharedHTTPCookieStorage]) {
|
| }
|
|
|
| -CookieStoreIOS::CookieStoreIOS(
|
| - net::CookieMonster::PersistentCookieStore* persistent_store,
|
| - NSHTTPCookieStorage* system_store)
|
| - : cookie_monster_(new net::CookieMonster(persistent_store, nullptr)),
|
| - system_store_(system_store),
|
| - creation_time_manager_(new CookieCreationTimeManager),
|
| - metrics_enabled_(false),
|
| - flush_delay_(base::TimeDelta::FromSeconds(10)),
|
| - synchronization_state_(NOT_SYNCHRONIZED),
|
| - cookie_cache_(new CookieCache()),
|
| - weak_factory_(this) {
|
| - DCHECK(system_store);
|
| -
|
| - NotificationTrampoline::GetInstance()->AddObserver(this);
|
| -
|
| - cookie_monster_->SetPersistSessionCookies(true);
|
| - cookie_monster_->SetForceKeepSessionState();
|
| -}
|
| -
|
| CookieStoreIOS::~CookieStoreIOS() {
|
| NotificationTrampoline::GetInstance()->RemoveObserver(this);
|
| }
|
| @@ -724,6 +705,25 @@ void CookieStoreIOS::FlushStore(const base::Closure& closure) {
|
| #pragma mark -
|
| #pragma mark Private methods
|
|
|
| +CookieStoreIOS::CookieStoreIOS(
|
| + net::CookieMonster::PersistentCookieStore* persistent_store,
|
| + NSHTTPCookieStorage* system_store)
|
| + : cookie_monster_(new net::CookieMonster(persistent_store, nullptr)),
|
| + system_store_(system_store),
|
| + creation_time_manager_(new CookieCreationTimeManager),
|
| + metrics_enabled_(false),
|
| + flush_delay_(base::TimeDelta::FromSeconds(10)),
|
| + synchronization_state_(NOT_SYNCHRONIZED),
|
| + cookie_cache_(new CookieCache()),
|
| + weak_factory_(this) {
|
| + DCHECK(system_store);
|
| +
|
| + NotificationTrampoline::GetInstance()->AddObserver(this);
|
| +
|
| + cookie_monster_->SetPersistSessionCookies(true);
|
| + cookie_monster_->SetForceKeepSessionState();
|
| +}
|
| +
|
| void CookieStoreIOS::ClearSystemStore() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| base::scoped_nsobject<NSArray> copy(
|
|
|