Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
BrowserSettings: update desktop UA string to match Chrome 33

This matches the corresponding update to Chromium 33 for Android WebView.

Change-Id: Id2a8a832c2a637f7c5284d5006b6f3475bfba560
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
reduce cookie tracking (4/4): onResume deletion of cookies

Optionally delete unwanted cookies (and localstorage) at every Browser
resume. The default for this feature is off - ie. maintain the current
Browser "keep every cookie" behaviour.

Optionally localstorage files (site databases) are also removed whenever
cookies have been deleted. This helps to reduce evercookie/supercookie
persistence.

A whitelist of sites that are permitted to keep cookies is stored in the
standard Browser shared_prefs. The site's cookie preference is set via a
menu checkbox when viewing the page. This allows opt-in whitelisting
behaviour on a per-site basis, suitable for saving eg. login cookies.

The cookie deletion itself is done by using existing API's to delete all
cookies and then selectively restore just those from the whitelisted sites.
Cookie counting is the only new API needed by this patch, and is used to
eliminate unnecessary cookie and localstorage deletes.

Although simplistic, onResume cookie filtering seems to work well and in
testing hasn't broken any web browsing. The underlying CookieMonster
functions operate on cached copies in ram and are asynchronous to disk so
there should be little or no measurable performance impact on browsing from
cookies. localstorage deletion is not cached by any layer so, if enabled,
might have some minor performance impact.

Change-Id: I55c69292a5ddc460e0e50b340dc4330c28becc5e
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Browser into HEAD