Create a field trial for Seccomp-BPF on Android.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 40 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
 #include "ui/events/event_switches.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "ui/views/views_switches.h"
 
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+#include "content/public/common/sandbox_init.h"
+#else
 #include "ui/message_center/message_center_switches.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #include "third_party/cros_system_api/switches/chrome_switches.h"
@@ skipping 1676 matching lines @@
      ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan,
                                autofill::switches::kDisableCreditCardScan)},
 #if defined(OS_CHROMEOS)
     {"disable-captive-portal-bypass-proxy",
      IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
      IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)},
 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_ANDROID)
-    {"enable-seccomp-filter-sandbox",
+    {"enable-seccomp-sandbox-android",
      IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
      IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
      kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)},
+     FEATURE_VALUE_TYPE(content::kSeccompSandboxAndroidFeature)},
 #endif
     {"enable-touch-hover",
      IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME,
      IDS_FLAGS_ENABLE_TOUCH_HOVER_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE("enable-touch-hover")},
     {"enable-fill-on-account-select",
      IDS_FILL_ON_ACCOUNT_SELECT_NAME,
      IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION,
      kOsAll,
@@ skipping 1205 matching lines @@
   FlagsState::GetInstance()->SetFeatureEntries(entries, count);
 }
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   return FlagsState::GetInstance()->GetFeatureEntries(count);
 }
 
 }  // namespace testing
 
 }  // namespace about_flags