Revert of 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 cdb355bd9031c2b1f9f45b1e8b6ed20019228603..1e5442ca024f99613ce9c18b570c93d51451f338 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
@@ -8,7 +8,6 @@
 #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"
@@ -82,8 +81,9 @@
 
   // Whitelisted ones can (this is the ID corresponding to the base 64 encoded
   // key in the init_platform_app_csp.json manifest.)
-  extensions::SimpleFeature::ScopedWhitelistForTest whitelist(
-      "ahplfneplbnjcflhdgkkjeiglkkfeelb");
+  std::string test_id = "ahplfneplbnjcflhdgkkjeiglkkfeelb";
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kWhitelistedExtensionID, test_id);
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("init_platform_app_csp.json");
   EXPECT_EQ(0U, extension->install_warnings().size())