Revert of Cache --whitelisted-extension-id in SimpleFeature.

chrome/browser/extensions/permission_message_combinations_unittest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/features/simple_feature.h"
 #include "extensions/common/permissions/permission_message_test_util.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
-const char kWhitelistedExtensionID[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-
 // Tests that ChromePermissionMessageProvider produces the expected messages for
 // various combinations of app/extension permissions.
 class PermissionMessageCombinationsUnittest : public testing::Test {
  public:
   PermissionMessageCombinationsUnittest()
-      : message_provider_(new ChromePermissionMessageProvider()),
-        whitelisted_extension_id_(kWhitelistedExtensionID) {}
+      : message_provider_(new ChromePermissionMessageProvider()) {}
   ~PermissionMessageCombinationsUnittest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
     // Force creation of ExtensionPrefs before adding extensions.
     env_.GetExtensionPrefs();
   }
 
  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;
     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),
-        kWhitelistedExtensionID);
+        *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
   // permission messages. Call this after installing an app with the expected
   // permission messages. The messages are tested for existence in any order.
   testing::AssertionResult CheckManifestProducesPermissions() {
     return VerifyNoPermissionMessages(app_->permissions_data());
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1) {
@@ skipping 134 matching lines @@
     expected_submessages.push_back(expected_submessages_5);
     return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
                                                    expected_messages,
                                                    expected_submessages, false);
   }
 
  private:
   extensions::TestExtensionEnvironment env_;
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
   scoped_refptr<const Extension> app_;
-  // Whitelist a known extension id so we can test all permissions. This ID
-  // will be used for each test app.
-  extensions::SimpleFeature::ScopedWhitelistForTest whitelisted_extension_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMessageCombinationsUnittest);
 };
 
 // Test that the USB, Bluetooth and Serial permissions do not coalesce on their
 // own, but do coalesce when more than 1 is present.
 TEST_F(PermissionMessageCombinationsUnittest, USBSerialBluetoothCoalescing) {
   // Test that the USB permission does not coalesce on its own.
   CreateAndInstall(
       "{"
@@ skipping 953 matching lines @@
 // TODO(sashab): Add a test that ensures that all permissions that can generate
 // a coalesced message can also generate a message on their own (i.e. ensure
 // that no permissions only modify other permissions).
 
 // TODO(sashab): Add a test for every permission message combination that can
 // generate a message.
 
 // TODO(aboxhall): Add tests for the automation API permission messages.
 
 }  // namespace extensions