Commit ac4622a3 authored by Ramin Halavati's avatar Ramin Halavati Committed by Commit Bot

Update SandboxPrioritizedOriginDatabase to respect incognito.

Sandbox prioritized origin database creates an on-disk file for the
prioritized origin. This is disabled for in-memory file system to avoid
writing file mappings to the disk.

Bug: 93417
Change-Id: Ie6a251e7fae40b513bc2247ce07e09052ce469a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572401Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Auto-Submit: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652556}
parent 82153a5d
......@@ -10,6 +10,7 @@
#include "base/pickle.h"
#include "storage/browser/fileapi/sandbox_isolated_origin_database.h"
#include "storage/browser/fileapi/sandbox_origin_database.h"
#include "third_party/leveldatabase/leveldb_chrome.h"
namespace storage {
......@@ -62,7 +63,9 @@ SandboxPrioritizedOriginDatabase::~SandboxPrioritizedOriginDatabase() = default;
bool SandboxPrioritizedOriginDatabase::InitializePrimaryOrigin(
const std::string& origin) {
if (!primary_origin_database_) {
const bool is_in_memory =
env_override_ && leveldb_chrome::IsMemEnv(env_override_);
if (!primary_origin_database_ && !is_in_memory) {
if (!MaybeLoadPrimaryOrigin() && ResetPrimaryOrigin(origin)) {
MaybeMigrateDatabase(origin);
primary_origin_database_.reset(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment