summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 19:32:37 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 19:32:37 +0000
commit55bb47d66ae62d025f47b1ae50678ef03922613d (patch)
treeff0466a26ddb668a9a687ab0093cd07353252375 /android_webview
parent50b710cdeca246c372c4231bd5e54d0db049d548 (diff)
downloadchromium_src-55bb47d66ae62d025f47b1ae50678ef03922613d.zip
chromium_src-55bb47d66ae62d025f47b1ae50678ef03922613d.tar.gz
chromium_src-55bb47d66ae62d025f47b1ae50678ef03922613d.tar.bz2
Revert 234855 "Encrypt all stored cookies on selected operating ..."
[Failed content_unittests on ASAN.] > Encrypt all stored cookies on selected operating systems. > > As part of the goal of protecting private user information, this encrypts the cookie values on operating systems with user-specific crypto APIs and that do not otherwise protect this data. > > Performance tests indicate a penalty of about 1ms per cookie (regardless of size) on a Mac and 0.1ms to 0.7ms (depending on the size) under Windows. This will be higher on older hardware but still insignificant. > > Encrypted data is binary (with an overhead of 128 bytes on Windows) and binary data must be stored in a BLOB so only one of two fields ("value" or "encrypted_value") will have data with the other being empty. Both values, however, need to be read & written when accessing a cookie because they are marked "non null"). > > BUG=313323 > > Review URL: https://codereview.chromium.org/24734007 TBR=bcwhite@chromium.org Review URL: https://codereview.chromium.org/70913003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_browser_context.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index cd10e6a..70c2507 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -22,7 +22,6 @@
#include "components/user_prefs/user_prefs.h"
#include "components/visitedlink/browser/visitedlink_master.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/browser/resource_context.h"
#include "content/public/browser/storage_partition.h"
@@ -145,8 +144,7 @@ void AwBrowserContext::PreMainMessageLoopRun() {
NULL,
NULL,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
- background_task_runner,
- scoped_ptr<content::CookieCryptoDelegate>());
+ background_task_runner);
cookie_store_->GetCookieMonster()->SetPersistSessionCookies(true);
url_request_context_getter_ =