| Index: android_webview/native/cookie_manager.cc
|
| diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc
|
| index a0f01f293672d7317b1252328c74735a469172f8..83565b49584876894e65059048dfc14490294687 100644
|
| --- a/android_webview/native/cookie_manager.cc
|
| +++ b/android_webview/native/cookie_manager.cc
|
| @@ -26,7 +26,6 @@
|
| #include "base/threading/thread_restrictions.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/cookie_crypto_delegate.h"
|
| #include "content/public/browser/cookie_store_factory.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "jni/AwCookieManager_jni.h"
|
| @@ -191,8 +190,7 @@
|
| NULL,
|
| NULL,
|
| client_task_runner,
|
| - background_task_runner,
|
| - scoped_ptr<content::CookieCryptoDelegate>());
|
| + background_task_runner);
|
| cookie_monster_ = cookie_store->GetCookieMonster();
|
| cookie_monster_->SetPersistSessionCookies(true);
|
| SetAcceptFileSchemeCookiesLocked(kDefaultFileSchemeAllowed);
|
|
|