diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index decfafa7da07d..d13c1835407ca 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -3635,9 +3635,6 @@ const FeatureEntry kFeatureEntries[] = { {"mac-syscall-sandbox", flag_descriptions::kMacSyscallSandboxName, flag_descriptions::kMacSyscallSandboxDescription, kOsMac, FEATURE_VALUE_TYPE(features::kMacSyscallSandbox)}, - {"mac-v2-gpu-sandbox", flag_descriptions::kMacV2GPUSandboxName, - flag_descriptions::kMacV2GPUSandboxDescription, kOsMac, - FEATURE_VALUE_TYPE(features::kMacV2GPUSandbox)}, #endif // OS_MAC #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_WIN) || defined(OS_MAC) {"web-share", flag_descriptions::kWebShareName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index e80607f8a14af..37a4710d7163c 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc @@ -3715,10 +3715,6 @@ const char kMacSyscallSandboxName[] = "Mac Syscall Filtering Sandbox"; const char kMacSyscallSandboxDescription[] = "Controls whether the macOS sandbox filters syscalls."; -const char kMacV2GPUSandboxName[] = "Mac V2 GPU Sandbox"; -const char kMacV2GPUSandboxDescription[] = - "Controls whether the GPU process on macOS uses the V1 or V2 sandbox."; - const char kMetalName[] = "Metal"; const char kMetalDescription[] = "Use Metal instead of OpenGL for rasterization (if out-of-process " diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 57bd6e08ddf48..337f0afb4add9 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -2156,9 +2156,6 @@ extern const char kImmersiveFullscreenDescription[]; extern const char kMacSyscallSandboxName[]; extern const char kMacSyscallSandboxDescription[]; -extern const char kMacV2GPUSandboxName[]; -extern const char kMacV2GPUSandboxDescription[]; - extern const char kMetalName[]; extern const char kMetalDescription[]; diff --git a/content/browser/child_process_launcher_helper_mac.cc b/content/browser/child_process_launcher_helper_mac.cc index 7dd338de3f738..fb0de8903f166 100644 --- a/content/browser/child_process_launcher_helper_mac.cc +++ b/content/browser/child_process_launcher_helper_mac.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/feature_list.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/posix/global_descriptors.h" @@ -17,7 +16,6 @@ #include "content/grit/content_resources.h" #include "content/public/browser/child_process_launcher_utils.h" #include "content/public/browser/content_browser_client.h" -#include "content/public/common/content_features.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" @@ -80,10 +78,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( command_line_->HasSwitch(sandbox::policy::switches::kNoSandbox) || sandbox::policy::IsUnsandboxedSandboxType(sandbox_type); - bool use_v2 = (sandbox_type != sandbox::policy::SandboxType::kGpu) || - base::FeatureList::IsEnabled(features::kMacV2GPUSandbox); - - if (use_v2 && !no_sandbox) { + if (!no_sandbox) { // Generate the profile string. std::string profile = sandbox::policy::SandboxMac::GetSandboxProfile(sandbox_type); diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index cc0f150d08c13..b3afa0e60f45a 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -97,10 +97,8 @@ #include "base/message_loop/message_pump_mac.h" #include "components/metal_util/device_removal.h" #include "components/metal_util/test_shader.h" -#include "content/public/common/content_features.h" #include "media/gpu/mac/vt_video_decode_accelerator_mac.h" #include "sandbox/mac/seatbelt.h" -#include "sandbox/policy/mac/sandbox_mac.h" #endif #if BUILDFLAG(USE_VAAPI) @@ -155,7 +153,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHelper { #endif #if defined(OS_MAC) - if (base::FeatureList::IsEnabled(features::kMacV2GPUSandbox)) { + { TRACE_EVENT0("gpu", "Initialize VideoToolbox"); media::InitializeVideoToolbox(); } diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc index b9ecf54987953..cb47933170ee9 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc @@ -970,9 +970,6 @@ const base::Feature kIOSurfaceCapturer{"IOSurfaceCapturer", const base::Feature kMacSyscallSandbox{"MacSyscallSandbox", base::FEATURE_DISABLED_BY_DEFAULT}; -const base::Feature kMacV2GPUSandbox{"MacV2GPUSandbox", - base::FEATURE_ENABLED_BY_DEFAULT}; - // Enables retrying to obtain list of available cameras on Macbooks after // restarting the video capture service if a previous attempt delivered zero // cameras. diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index 9e261f0e4e35b..2b397c2f0e703 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h @@ -226,7 +226,6 @@ CONTENT_EXPORT extern const base::Feature kWindowCaptureMacV2; CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac; CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer; CONTENT_EXPORT extern const base::Feature kMacSyscallSandbox; -CONTENT_EXPORT extern const base::Feature kMacV2GPUSandbox; CONTENT_EXPORT extern const base::Feature kRetryGetVideoCaptureDeviceInfos; #endif // defined(OS_MAC) diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 8062a4e3c2f8e..df56f51701810 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json @@ -3982,21 +3982,6 @@ ] } ], - "MacV2GPUSandbox": [ - { - "platforms": [ - "mac" - ], - "experiments": [ - { - "name": "Enabled", - "enable_features": [ - "MacV2GPUSandbox" - ] - } - ] - } - ], "ManagedSigninPopup": [ { "platforms": [