Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1525)

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 648113002: Removing extensions::FeatureSwitch which is no longer used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index c3dad3f491ea90636b9320bc9be6aa5b5e14d1ba..c78fb00ec231e72318713dc51daca25569ab4f17 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -164,7 +164,6 @@ using extensions::ExtensionRegistry;
using extensions::ExtensionResource;
using extensions::ExtensionSystem;
using extensions::FakeSafeBrowsingDatabaseManager;
-using extensions::FeatureSwitch;
using extensions::Manifest;
using extensions::PermissionSet;
using extensions::TestExtensionSystem;
@@ -472,9 +471,6 @@ class ExtensionServiceTest : public extensions::ExtensionServiceTestBase,
: unloaded_reason_(UnloadedExtensionInfo::REASON_UNDEFINED),
installed_(NULL),
was_update_(false),
- override_external_install_prompt_(
- FeatureSwitch::prompt_for_external_extensions(),
- false),
expected_extensions_count_(0) {
registrar_.Add(this,
extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
@@ -1116,7 +1112,6 @@ class ExtensionServiceTest : public extensions::ExtensionServiceTestBase,
const Extension* installed_;
bool was_update_;
std::string old_name_;
- FeatureSwitch::ScopedOverride override_external_install_prompt_;
private:
// Create a CrxInstaller and install the CRX file.
@@ -6799,8 +6794,6 @@ TEST_F(ExtensionSourcePriorityTest, InstallExternalBlocksSyncRequest) {
// Test that installing an external extension displays a GlobalError.
TEST_F(ExtensionServiceTest, ExternalInstallGlobalError) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
InitializeEmptyExtensionService();
MockExtensionProvider* provider =
@@ -6853,8 +6846,6 @@ TEST_F(ExtensionServiceTest, ExternalInstallGlobalError) {
// Test that external extensions are initially disabled, and that enabling
// them clears the prompt.
TEST_F(ExtensionServiceTest, ExternalInstallInitiallyDisabled) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
InitializeEmptyExtensionService();
MockExtensionProvider* provider =
@@ -6891,8 +6882,6 @@ TEST_F(ExtensionServiceTest, ExternalInstallInitiallyDisabled) {
#define MAYBE_ExternalInstallMultiple ExternalInstallMultiple
#endif
TEST_F(ExtensionServiceTest, MAYBE_ExternalInstallMultiple) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
InitializeEmptyExtensionService();
MockExtensionProvider* provider =
@@ -6940,8 +6929,6 @@ TEST_F(ExtensionServiceTest, MAYBE_ExternalInstallMultiple) {
// Test that there is a bubble for external extensions that update
// from the webstore if the profile is not new.
TEST_F(ExtensionServiceTest, ExternalInstallUpdatesFromWebstoreOldProfile) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
// This sets up the ExtensionPrefs used by our ExtensionService to be
// post-first run.
@@ -6973,8 +6960,6 @@ TEST_F(ExtensionServiceTest, ExternalInstallUpdatesFromWebstoreOldProfile) {
// Test that there is no bubble for external extensions if the profile is new.
TEST_F(ExtensionServiceTest, ExternalInstallUpdatesFromWebstoreNewProfile) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
InitializeEmptyExtensionService();
@@ -7003,8 +6988,6 @@ TEST_F(ExtensionServiceTest, ExternalInstallUpdatesFromWebstoreNewProfile) {
// Test that clicking to remove the extension on an external install warning
// uninstalls the extension.
TEST_F(ExtensionServiceTest, ExternalInstallClickToRemove) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
ExtensionServiceInitParams params = CreateDefaultInitParams();
params.is_first_run = false;
@@ -7045,8 +7028,6 @@ TEST_F(ExtensionServiceTest, ExternalInstallClickToRemove) {
// Test that clicking to keep the extension on an external install warning
// re-enables the extension.
TEST_F(ExtensionServiceTest, ExternalInstallClickToKeep) {
- FeatureSwitch::ScopedOverride prompt(
- FeatureSwitch::prompt_for_external_extensions(), true);
ExtensionServiceInitParams params = CreateDefaultInitParams();
params.is_first_run = false;
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698