Delete unused V1 Mac sandbox profiles.
- The V1 common.sb file is merged into the V1 gpu.sb file. The GPU
sandbox will be moved to V2 as part of https://crbug.com/915934.
- common_v2.sb, renderer_v2.sb, and ppapi_v2.sb all lose their "_v2"
suffix and replace the V1 file by the same name.
- sandbox_mac.mm is thinned out to only support the V1 GPU sandbox.
No intended behavior change.
Bug: 689306
Change-Id: Icfc36c5a7b1907e0c93d6a87bdd1d0ffe18cf616
Reviewed-on: https://chromium-review.googlesource.com/c/1380554
Reviewed-by: Greg Kerr <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Robert Sesek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#617638}diff --git a/content/renderer/sandbox_mac_v2_unittest.mm b/content/renderer/sandbox_mac_v2_unittest.mm
index cc1ff75..56beb45 100644
--- a/content/renderer/sandbox_mac_v2_unittest.mm
+++ b/content/renderer/sandbox_mac_v2_unittest.mm
@@ -24,8 +24,8 @@
#include "content/test/test_content_client.h"
#include "sandbox/mac/sandbox_compiler.h"
#include "sandbox/mac/seatbelt_exec.h"
-#include "services/service_manager/sandbox/mac/common_v2.sb.h"
-#include "services/service_manager/sandbox/mac/renderer_v2.sb.h"
+#include "services/service_manager/sandbox/mac/common.sb.h"
+#include "services/service_manager/sandbox/mac/renderer.sb.h"
#include "services/service_manager/sandbox/mac/sandbox_mac.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
@@ -93,8 +93,8 @@
MULTIPROCESS_TEST_MAIN(SandboxProfileProcess) {
TestContentClient content_client;
const std::string profile =
- std::string(service_manager::kSeatbeltPolicyString_common_v2) +
- service_manager::kSeatbeltPolicyString_renderer_v2;
+ std::string(service_manager::kSeatbeltPolicyString_common) +
+ service_manager::kSeatbeltPolicyString_renderer;
sandbox::SandboxCompiler compiler(profile);
// Create the logging file and pass /bin/ls as the executable path.
