| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ios/chrome/browser/net/cookie_util.h" | 5 #include "ios/chrome/browser/net/cookie_util.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <sys/sysctl.h> | 9 #include <sys/sysctl.h> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #import "base/mac/bind_objc_block.h" | 12 #import "base/mac/bind_objc_block.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 15 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 16 #include "ios/net/cookies/cookie_store_ios.h" | 16 #include "ios/net/cookies/cookie_store_ios_persistent.h" |
| 17 #include "ios/web/public/web_thread.h" | 17 #include "ios/web/public/web_thread.h" |
| 18 #include "net/cookies/cookie_monster.h" | 18 #include "net/cookies/cookie_monster.h" |
| 19 #include "net/cookies/cookie_store.h" | 19 #include "net/cookies/cookie_store.h" |
| 20 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h" | 20 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h" |
| 21 #include "net/url_request/url_request_context.h" | 21 #include "net/url_request/url_request_context.h" |
| 22 #include "net/url_request/url_request_context_getter.h" | 22 #include "net/url_request/url_request_context_getter.h" |
| 23 | 23 |
| 24 #if !defined(__has_feature) || !__has_feature(objc_arc) | 24 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 25 #error "This file requires ARC support." | 25 #error "This file requires ARC support." |
| 26 #endif | 26 #endif |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 return CreateCookieMonster(config); | 89 return CreateCookieMonster(config); |
| 90 | 90 |
| 91 scoped_refptr<net::SQLitePersistentCookieStore> persistent_store = nullptr; | 91 scoped_refptr<net::SQLitePersistentCookieStore> persistent_store = nullptr; |
| 92 if (config.session_cookie_mode == | 92 if (config.session_cookie_mode == |
| 93 CookieStoreConfig::RESTORED_SESSION_COOKIES) { | 93 CookieStoreConfig::RESTORED_SESSION_COOKIES) { |
| 94 DCHECK(!config.path.empty()); | 94 DCHECK(!config.path.empty()); |
| 95 persistent_store = CreatePersistentCookieStore( | 95 persistent_store = CreatePersistentCookieStore( |
| 96 config.path, true /* restore_old_session_cookies */, | 96 config.path, true /* restore_old_session_cookies */, |
| 97 config.crypto_delegate); | 97 config.crypto_delegate); |
| 98 } | 98 } |
| 99 return base::MakeUnique<net::CookieStoreIOS>(persistent_store.get()); | 99 return base::MakeUnique<net::CookieStoreIOSPersistent>( |
| 100 persistent_store.get()); |
| 100 } | 101 } |
| 101 | 102 |
| 102 bool ShouldClearSessionCookies() { | 103 bool ShouldClearSessionCookies() { |
| 103 NSUserDefaults* standardDefaults = [NSUserDefaults standardUserDefaults]; | 104 NSUserDefaults* standardDefaults = [NSUserDefaults standardUserDefaults]; |
| 104 struct timeval boottime; | 105 struct timeval boottime; |
| 105 int mib[2] = {CTL_KERN, KERN_BOOTTIME}; | 106 int mib[2] = {CTL_KERN, KERN_BOOTTIME}; |
| 106 size_t size = sizeof(boottime); | 107 size_t size = sizeof(boottime); |
| 107 time_t lastCookieDeletionDate = | 108 time_t lastCookieDeletionDate = |
| 108 [standardDefaults integerForKey:kLastCookieDeletionDate]; | 109 [standardDefaults integerForKey:kLastCookieDeletionDate]; |
| 109 time_t now; | 110 time_t now; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 124 browser_state->GetRequestContext(); | 125 browser_state->GetRequestContext(); |
| 125 web::WebThread::PostTask( | 126 web::WebThread::PostTask( |
| 126 web::WebThread::IO, FROM_HERE, base::BindBlockArc(^{ | 127 web::WebThread::IO, FROM_HERE, base::BindBlockArc(^{ |
| 127 getter->GetURLRequestContext() | 128 getter->GetURLRequestContext() |
| 128 ->cookie_store() | 129 ->cookie_store() |
| 129 ->DeleteSessionCookiesAsync(base::Bind(&DoNothing)); | 130 ->DeleteSessionCookiesAsync(base::Bind(&DoNothing)); |
| 130 })); | 131 })); |
| 131 } | 132 } |
| 132 | 133 |
| 133 } // namespace cookie_util | 134 } // namespace cookie_util |
| OLD | NEW |