From 99240b7ad619c9e5071e88dfd72b72120d600fdb Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 7 Jun 2019 14:43:43 -0700 Subject: [PATCH] Remove unnecessary whitelisted flags for --dart-flags (#9233) --- shell/common/shell_unittests.cc | 4 ++-- shell/common/switches.cc | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc index 79143368c..1d6ffb9a8 100644 --- a/shell/common/shell_unittests.cc +++ b/shell/common/shell_unittests.cc @@ -221,7 +221,7 @@ TEST_F(ShellTest, BlacklistedDartVMFlag) { TEST_F(ShellTest, WhitelistedDartVMFlag) { const std::vector options = { fml::CommandLine::Option("dart-flags", - "--max_profile_depth 1,--trace_service")}; + "--max_profile_depth 1,--random_seed 42")}; fml::CommandLine command_line("", options, std::vector()); flutter::Settings settings = flutter::SettingsFromCommandLine(command_line); @@ -229,7 +229,7 @@ TEST_F(ShellTest, WhitelistedDartVMFlag) { FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DYNAMIC_RELEASE EXPECT_EQ(settings.dart_flags.size(), 2u); EXPECT_EQ(settings.dart_flags[0], "--max_profile_depth 1"); - EXPECT_EQ(settings.dart_flags[1], "--trace_service"); + EXPECT_EQ(settings.dart_flags[1], "--random_seed 42"); #else EXPECT_EQ(settings.dart_flags.size(), 0u); #endif diff --git a/shell/common/switches.cc b/shell/common/switches.cc index cc3dff62f..83a0c19d1 100644 --- a/shell/common/switches.cc +++ b/shell/common/switches.cc @@ -41,11 +41,13 @@ struct SwitchDesc { FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DYNAMIC_RELEASE // List of common and safe VM flags to allow to be passed directly to the VM. +// clang-format off static const std::string gDartFlagsWhitelist[] = { - "--max_profile_depth", "--profile_period", "--random_seed", - "--trace_profiler", "--trace_profiler_verbose", "--trace_service", - "--trace_service_verbose", + "--max_profile_depth", + "--profile_period", + "--random_seed", }; +// clang-format on #endif -- GitLab