Cache --whitelisted-extension-id in SimpleFeature.

chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
index 1e5442ca024f99613ce9c18b570c93d51451f338..d2fd1b831f32a2b01a914702c21865dab47ed4b2 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
@@ -8,6 +8,7 @@
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/error_utils.h"
+#include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/csp_info.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
@@ -79,11 +80,11 @@ TEST_F(PlatformAppsManifestTest, PlatformAppContentSecurityPolicy) {
   RunTestcases(
       warning_testcases, arraysize(warning_testcases), EXPECT_TYPE_WARNING);
 
-  // Whitelisted ones can (this is the ID corresponding to the base 64 encoded
-  // key in the init_platform_app_csp.json manifest.)
-  std::string test_id = "ahplfneplbnjcflhdgkkjeiglkkfeelb";
-  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kWhitelistedExtensionID, test_id);
+  // The whitelisted extension ID is cached the first time it is used, so set it
+  // before running the test. This is the ID corresponding to the base 64
+  // encoded key in the init_platform_app_csp.json manifest.
+  extensions::SimpleFeature::SetWhitelistedExtensionId(
+      "ahplfneplbnjcflhdgkkjeiglkkfeelb");
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("init_platform_app_csp.json");
   EXPECT_EQ(0U, extension->install_warnings().size())