chromium/src
0
Fork 0
Code Activity

Replace IS_CHROMEOS_ASH with IS_CHROMEOS in storage.

Browse Source 
This is part of Lacros sunset. Since Lacros is gone, the two macros
mean the same thing.

Bug: 354842935
Change-Id: I7894b22072c4a24d0c88d6332509fdf377899527
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6331775
Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1430094}
This commit is contained in:
Yuta Hijikata
2025-03-09 21:55:57 -07:00
committed by Chromium LUCI CQ
parent 601a221d98
commit 70971f14e0
4 changed files with 9 additions and 12 deletions

5
storage/browser/blob/blob_memory_controller.cc

@ -35,7 +35,6 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "storage/browser/blob/blob_data_builder.h"
#include "storage/browser/blob/blob_data_item.h"
#include "storage/browser/blob/shareable_blob_data_item.h"
@ -92,7 +91,7 @@ BlobStorageLimits CalculateBlobStorageLimitsImpl(
// Don't do specialty configuration for error size (-1).
if (memory_size > 0) {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) && \
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && \
defined(ARCH_CPU_64_BITS)
constexpr size_t kTwoGigabytes = 2ull * 1024 * 1024 * 1024;
limits.max_blob_in_memory_space = kTwoGigabytes;
@ -110,7 +109,7 @@ BlobStorageLimits CalculateBlobStorageLimitsImpl(
// Don't do specialty configuration for error size (-1). Allow no disk.
if (disk_size >= 0) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
limits.desired_max_disk_space = static_cast<uint64_t>(disk_size / 2ll);
#elif BUILDFLAG(IS_ANDROID)
limits.desired_max_disk_space = static_cast<uint64_t>(3ll * disk_size / 50);

6
storage/browser/file_system/external_mount_points.cc

@ -10,7 +10,7 @@
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
#include "base/strings/strcat.h"
#include "build/chromeos_buildflags.h"
#include "build/build_config.h"
#include "storage/browser/file_system/file_system_url.h"
#include "third_party/blink/public/common/storage_key/storage_key.h"
@ -298,8 +298,8 @@ FileSystemURL ExternalMountPoints::CrackFileSystemURL(
base::FilePath virtual_path = url.path();
if (url.type() == kFileSystemTypeLocalForPlatformApp) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
// On Chrome OS, find a mount point and virtual path for the external fs.
#if BUILDFLAG(IS_CHROMEOS)
// On ChromeOS, find a mount point and virtual path for the external fs.
if (!GetVirtualPath(url.path(), &virtual_path))
return FileSystemURL();
#else

3
storage/browser/file_system/file_system_context_unittest.cc

@ -18,7 +18,6 @@
#include "base/test/task_environment.h"
#include "base/test/test_future.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "storage/browser/file_system/external_mount_points.h"
#include "storage/browser/file_system/file_system_backend.h"
@ -130,7 +129,7 @@ class FileSystemContextTest : public testing::Test {
// It is not valid to pass nullptr ExternalMountPoints to FileSystemContext on
// ChromeOS.
#if !BUILDFLAG(IS_CHROMEOS_ASH)
#if !BUILDFLAG(IS_CHROMEOS)
TEST_F(FileSystemContextTest, NullExternalMountPoints) {
scoped_refptr<FileSystemContext> file_system_context =
CreateFileSystemContextForTest(/*external_mount_points=*/nullptr);

7
storage/browser/test/test_file_system_options.cc

@ -8,13 +8,12 @@
#include <vector>
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
namespace storage {
FileSystemOptions CreateIncognitoFileSystemOptions() {
std::vector<std::string> additional_allowed_schemes;
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
additional_allowed_schemes.push_back("chrome-extension");
#endif
return FileSystemOptions(FileSystemOptions::PROFILE_MODE_INCOGNITO,
@ -25,7 +24,7 @@ FileSystemOptions CreateIncognitoFileSystemOptions() {
FileSystemOptions CreateAllowFileAccessOptions() {
std::vector<std::string> additional_allowed_schemes;
additional_allowed_schemes.push_back("file");
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
additional_allowed_schemes.push_back("chrome-extension");
#endif
return FileSystemOptions(FileSystemOptions::PROFILE_MODE_NORMAL,
@ -35,7 +34,7 @@ FileSystemOptions CreateAllowFileAccessOptions() {
FileSystemOptions CreateDisallowFileAccessOptions() {
std::vector<std::string> additional_allowed_schemes;
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
additional_allowed_schemes.push_back("chrome-extension");
#endif
return FileSystemOptions(FileSystemOptions::PROFILE_MODE_NORMAL,