Cache --whitelisted-extension-id in SimpleFeature.

chrome/browser/extensions/permission_message_combinations_unittest.cc

Index: chrome/browser/extensions/permission_message_combinations_unittest.cc
diff --git a/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chrome/browser/extensions/permission_message_combinations_unittest.cc
index 7581ff1d42618ca91b4167cdc2b85899086ceaf3..819c52dc7a6c5f53b0da40d6f3a66d79d19cc02f 100644
--- a/chrome/browser/extensions/permission_message_combinations_unittest.cc
+++ b/chrome/browser/extensions/permission_message_combinations_unittest.cc
@@ -29,20 +29,27 @@ class PermissionMessageCombinationsUnittest : public testing::Test {
     testing::Test::SetUp();
     // Force creation of ExtensionPrefs before adding extensions.
     env_.GetExtensionPrefs();
+
+    // Whitelist a known extension id so we can test all permissions. This ID
+    // will be used for each test app.
+    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+        switches::kWhitelistedExtensionID, "ahplfneplbnjcflhdgkkjeiglkkfeelb");
   }
 
  protected:
   // Create and install an app or extension with the given manifest JSON string.
   // Single-quotes in the string will be replaced with double quotes.
   void CreateAndInstall(const std::string& json_manifest) {
-    std::string json_manifest_with_double_quotes = json_manifest;
+    // Add the manifest key so that the ID will be the whitelisted ID.
+    std::string json_manifest_with_key = json_manifest;
+    json_manifest_with_key.replace(json_manifest.length() - 1,
+       json_manifest.length(),
+                ",'key': 'd2hpdGVsaXN0IG1l'}");

[not at google - send to devlin, 2015/04/02 14:31:57]

Voodoo... I suppose the 'd2hpdGVsaXN0IG1l' corresponds with the
"ahplfneplbnjcflhdgkkjeiglkkfeelb" ID?

Another testing improvement would be to add a version of MakeExtension which
takes an ID. All MakeExtension does is construct a manifest to pass to
ExtensionBuilder, which knows how to set the ID manually.

[jackhou1, 2015/04/07 23:46:21]

Done.

+    std::string json_manifest_with_double_quotes = json_manifest_with_key;
     std::replace(json_manifest_with_double_quotes.begin(),
                  json_manifest_with_double_quotes.end(), '\'', '"');
     app_ = env_.MakeExtension(
         *base::test::ParseJson(json_manifest_with_double_quotes));
-    // Add the app to any whitelists so we can test all permissions.
-    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kWhitelistedExtensionID, app_->id());
   }
 
   // Checks whether the currently installed app or extension produces the given