Commit 27e15552 authored by Austin Sullivan's avatar Austin Sullivan Committed by Chromium LUCI CQ

Convert SandboxPrioritizedOriginDatabase to unique_ptr

In ObfuscatedFileUtil::InitOriginDatabase method

Bug: N/A
Change-Id: I630c0e40a56db336c12f80c7869fd48a6fe6f451
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627136
Auto-Submit: Austin Sullivan <asully@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843201}
parent 9f1169b6
...@@ -1348,18 +1348,19 @@ bool ObfuscatedFileUtil::InitOriginDatabase(const url::Origin& origin_hint, ...@@ -1348,18 +1348,19 @@ bool ObfuscatedFileUtil::InitOriginDatabase(const url::Origin& origin_hint,
} }
} }
SandboxPrioritizedOriginDatabase* prioritized_origin_database = std::unique_ptr<SandboxPrioritizedOriginDatabase>
new SandboxPrioritizedOriginDatabase(file_system_directory_, prioritized_origin_database =
env_override_); std::make_unique<SandboxPrioritizedOriginDatabase>(
origin_database_.reset(prioritized_origin_database); file_system_directory_, env_override_);
if (!origin_hint.opaque() || !HasIsolatedStorage(origin_hint))
return true;
if (origin_hint.opaque() && HasIsolatedStorage(origin_hint)) {
const std::string isolated_origin_string = const std::string isolated_origin_string =
GetIdentifierFromOrigin(origin_hint); GetIdentifierFromOrigin(origin_hint);
prioritized_origin_database->InitializePrimaryOrigin(
isolated_origin_string);
}
prioritized_origin_database->InitializePrimaryOrigin(isolated_origin_string); origin_database_ = std::move(prioritized_origin_database);
return true; return true;
} }
......
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