BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/chromium/content/browser/dom_storage/session_storage_context_mojo.h b/chromium/content/browser/dom_storage/session_storage_context_mojo.h
index 078bcdde09e..919c1356d22 100644
--- a/chromium/content/browser/dom_storage/session_storage_context_mojo.h
+++ b/chromium/content/browser/dom_storage/session_storage_context_mojo.h
@@ -54,8 +54,14 @@ class CONTENT_EXPORT SessionStorageContextMojo {
                               bool should_persist);
   void Flush();
 
+  // Used by content settings to alter the behavior around
+  // what data to keep and what data to discard at shutdown.
+  // The policy is not so straight forward to describe, see
+  // the implementation for details.
+  void SetForceKeepSessionState() { force_keep_session_state_ = true; }
+
   void GetStorageUsage(GetStorageUsageCallback callback);
-  void DeleteStorage(const GURL& origin,
+  void DeleteStorage(const url::Origin& origin,
                      const std::string& persistent_namespace_id);
 
   // Called when the owning BrowserContext is ending.
@@ -80,6 +86,8 @@ class CONTENT_EXPORT SessionStorageContextMojo {
   const base::Optional<base::FilePath> partition_directory_path_;
   std::string leveldb_name_;
 
+  bool force_keep_session_state_ = false;
+
   base::WeakPtrFactory<SessionStorageContextMojo> weak_ptr_factory_;
 };