| Index: content/browser/net/sqlite_persistent_cookie_store.cc
|
| diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc
|
| index 3e8e6e5fb8531c59d24c0dc727ed289870baafe8..923ad72f3279564ef708b1e2d30c0390648d2e98 100644
|
| --- a/content/browser/net/sqlite_persistent_cookie_store.cc
|
| +++ b/content/browser/net/sqlite_persistent_cookie_store.cc
|
| @@ -1279,19 +1279,19 @@ net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) {
|
|
|
| if (config.path.empty()) {
|
| // Empty path means in-memory store.
|
| - cookie_monster = new net::CookieMonster(NULL, config.cookie_delegate);
|
| + cookie_monster = new net::CookieMonster(NULL, config.cookie_delegate.get());
|
| } else {
|
| scoped_refptr<base::SequencedTaskRunner> client_task_runner =
|
| config.client_task_runner;
|
| scoped_refptr<base::SequencedTaskRunner> background_task_runner =
|
| config.background_task_runner;
|
|
|
| - if (!client_task_runner) {
|
| + if (!client_task_runner.get()) {
|
| client_task_runner =
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
|
| }
|
|
|
| - if (!background_task_runner) {
|
| + if (!background_task_runner.get()) {
|
| background_task_runner =
|
| BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
|
| BrowserThread::GetBlockingPool()->GetSequenceToken());
|
| @@ -1304,11 +1304,11 @@ net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) {
|
| background_task_runner,
|
| (config.session_cookie_mode ==
|
| CookieStoreConfig::RESTORED_SESSION_COOKIES),
|
| - config.storage_policy,
|
| + config.storage_policy.get(),
|
| config.crypto_delegate);
|
|
|
| cookie_monster =
|
| - new net::CookieMonster(persistent_store, config.cookie_delegate);
|
| + new net::CookieMonster(persistent_store, config.cookie_delegate.get());
|
| if ((config.session_cookie_mode ==
|
| CookieStoreConfig::PERSISTANT_SESSION_COOKIES) ||
|
| (config.session_cookie_mode ==
|
|
|