Commit e9a042e9 authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[Extensions Cleanup] Remove FeatureSwitch::error_console()

The ErrorConsole has been launched for several milestones. Remove the
corresponding feature switch.

Bug: None
Change-Id: I403d6dedb51227433a75b99cc6de244eaf06d851
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2131360Reviewed-by: default avatarDavid Bertoni <dbertoni@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755457}
parent ec412f3c
...@@ -1055,8 +1055,6 @@ TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateGetExtensionsInfo) { ...@@ -1055,8 +1055,6 @@ TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateGetExtensionsInfo) {
// Test developerPrivate.deleteExtensionErrors. // Test developerPrivate.deleteExtensionErrors.
TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateDeleteExtensionErrors) { TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateDeleteExtensionErrors) {
FeatureSwitch::ScopedOverride error_console_override(
FeatureSwitch::error_console(), true);
profile()->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true); profile()->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
const Extension* extension = LoadSimpleExtension(); const Extension* extension = LoadSimpleExtension();
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h" #include "extensions/common/extension_builder.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permission_message.h"
#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_data.h"
...@@ -230,9 +229,6 @@ class ExtensionInfoGeneratorUnitTest : public ExtensionServiceTestBase { ...@@ -230,9 +229,6 @@ class ExtensionInfoGeneratorUnitTest : public ExtensionServiceTestBase {
// Test some of the basic fields. // Test some of the basic fields.
TEST_F(ExtensionInfoGeneratorUnitTest, BasicInfoTest) { TEST_F(ExtensionInfoGeneratorUnitTest, BasicInfoTest) {
// Enable error console for testing.
FeatureSwitch::ScopedOverride error_console_override(
FeatureSwitch::error_console(), true);
profile()->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true); profile()->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
const char kName[] = "extension name"; const char kName[] = "extension name";
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <stddef.h> #include <stddef.h>
#include "base/feature_list.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/run_loop.h" #include "base/run_loop.h"
...@@ -27,7 +26,6 @@ ...@@ -27,7 +26,6 @@
#include "extensions/common/error_utils.h" #include "extensions/common/error_utils.h"
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/extension_urls.h" #include "extensions/common/extension_urls.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_constants.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -204,16 +202,6 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest { ...@@ -204,16 +202,6 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
ACTION_NONE ACTION_NONE
}; };
void SetUpInProcessBrowserTestFixture() override {
ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
// We need to enable the ErrorConsole FeatureSwitch in order to collect
// errors. This should be enabled on any channel <= Dev, but let's make
// sure (in case a test is running on, e.g., a beta channel).
FeatureSwitch::error_console()->SetOverrideValue(
FeatureSwitch::OVERRIDE_ENABLED);
}
void SetUpOnMainThread() override { void SetUpOnMainThread() override {
ExtensionBrowserTest::SetUpOnMainThread(); ExtensionBrowserTest::SetUpOnMainThread();
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "extensions/browser/unloaded_extension_reason.h" #include "extensions/browser/unloaded_extension_reason.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "extensions/common/extension_builder.h" #include "extensions/common/extension_builder.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/features/feature_channel.h" #include "extensions/common/features/feature_channel.h"
#include "extensions/common/value_builder.h" #include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -41,10 +40,6 @@ class ErrorConsoleUnitTest : public testing::Test { ...@@ -41,10 +40,6 @@ class ErrorConsoleUnitTest : public testing::Test {
void SetUp() override { void SetUp() override {
testing::Test::SetUp(); testing::Test::SetUp();
// Errors are only kept if we have the FeatureSwitch and have Developer Mode
// enabled.
FeatureSwitch::error_console()->SetOverrideValue(
FeatureSwitch::OVERRIDE_ENABLED);
profile_.reset(new TestingProfile); profile_.reset(new TestingProfile);
profile_->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true); profile_->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
error_console_ = ErrorConsole::Get(profile_.get()); error_console_ = ErrorConsole::Get(profile_.get());
......
...@@ -97,12 +97,6 @@ void ExtensionSettingsUIBrowserTest::SetAutoConfirmUninstall() { ...@@ -97,12 +97,6 @@ void ExtensionSettingsUIBrowserTest::SetAutoConfirmUninstall() {
extensions::ScopedTestDialogAutoConfirm::ACCEPT); extensions::ScopedTestDialogAutoConfirm::ACCEPT);
} }
void ExtensionSettingsUIBrowserTest::EnableErrorConsole() {
error_console_override_ =
std::make_unique<extensions::FeatureSwitch::ScopedOverride>(
extensions::FeatureSwitch::error_console(), true);
}
void ExtensionSettingsUIBrowserTest::SetDevModeEnabled(bool enabled) { void ExtensionSettingsUIBrowserTest::SetDevModeEnabled(bool enabled) {
browser()->profile()->GetPrefs()->SetBoolean( browser()->profile()->GetPrefs()->SetBoolean(
prefs::kExtensionsUIDeveloperMode, enabled); prefs::kExtensionsUIDeveloperMode, enabled);
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "chrome/test/base/web_ui_browser_test.h" #include "chrome/test/base/web_ui_browser_test.h"
#include "extensions/browser/scoped_ignore_content_verifier_for_test.h" #include "extensions/browser/scoped_ignore_content_verifier_for_test.h"
#include "extensions/browser/test_management_policy.h" #include "extensions/browser/test_management_policy.h"
#include "extensions/common/feature_switch.h"
namespace extensions { namespace extensions {
class Extension; class Extension;
...@@ -72,10 +71,6 @@ class ExtensionSettingsUIBrowserTest : public WebUIBrowserTest { ...@@ -72,10 +71,6 @@ class ExtensionSettingsUIBrowserTest : public WebUIBrowserTest {
// Disable extension install verification. // Disable extension install verification.
extensions::ScopedInstallVerifierBypassForTest ignore_install_verification_; extensions::ScopedInstallVerifierBypassForTest ignore_install_verification_;
// Used to enable the error console.
std::unique_ptr<extensions::FeatureSwitch::ScopedOverride>
error_console_override_;
std::unique_ptr<extensions::ScopedTestDialogAutoConfirm> std::unique_ptr<extensions::ScopedTestDialogAutoConfirm>
uninstall_auto_confirm_; uninstall_auto_confirm_;
......
...@@ -220,7 +220,6 @@ CrExtensionsErrorConsoleA11yTest = ...@@ -220,7 +220,6 @@ CrExtensionsErrorConsoleA11yTest =
/** @override */ /** @override */
testGenPreamble() { testGenPreamble() {
GEN(' SetDevModeEnabled(true);'); GEN(' SetDevModeEnabled(true);');
GEN(' EnableErrorConsole();');
GEN(' InstallErrorsExtension();'); GEN(' InstallErrorsExtension();');
} }
......
...@@ -761,7 +761,6 @@ var CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest { ...@@ -761,7 +761,6 @@ var CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest {
/** @override */ /** @override */
testGenPreamble() { testGenPreamble() {
GEN(' SetDevModeEnabled(true);'); GEN(' SetDevModeEnabled(true);');
GEN(' EnableErrorConsole();');
GEN(' InstallErrorsExtension();'); GEN(' InstallErrorsExtension();');
} }
......
...@@ -33,7 +33,6 @@ class CommonSwitches { ...@@ -33,7 +33,6 @@ class CommonSwitches {
#else #else
FeatureSwitch::DEFAULT_DISABLED), FeatureSwitch::DEFAULT_DISABLED),
#endif #endif
error_console(switches::kErrorConsole, FeatureSwitch::DEFAULT_ENABLED),
embedded_extension_options(switches::kEmbeddedExtensionOptions, embedded_extension_options(switches::kEmbeddedExtensionOptions,
FeatureSwitch::DEFAULT_DISABLED), FeatureSwitch::DEFAULT_DISABLED),
trace_app_source(switches::kTraceAppSource, trace_app_source(switches::kTraceAppSource,
...@@ -54,7 +53,6 @@ class CommonSwitches { ...@@ -54,7 +53,6 @@ class CommonSwitches {
// Default is yes. // Default is yes.
FeatureSwitch prompt_for_external_extensions; FeatureSwitch prompt_for_external_extensions;
FeatureSwitch error_console;
FeatureSwitch embedded_extension_options; FeatureSwitch embedded_extension_options;
FeatureSwitch trace_app_source; FeatureSwitch trace_app_source;
FeatureSwitch load_media_router_component_extension; FeatureSwitch load_media_router_component_extension;
...@@ -71,9 +69,6 @@ FeatureSwitch* FeatureSwitch::force_dev_mode_highlighting() { ...@@ -71,9 +69,6 @@ FeatureSwitch* FeatureSwitch::force_dev_mode_highlighting() {
FeatureSwitch* FeatureSwitch::prompt_for_external_extensions() { FeatureSwitch* FeatureSwitch::prompt_for_external_extensions() {
return &g_common_switches.Get().prompt_for_external_extensions; return &g_common_switches.Get().prompt_for_external_extensions;
} }
FeatureSwitch* FeatureSwitch::error_console() {
return &g_common_switches.Get().error_console;
}
FeatureSwitch* FeatureSwitch::embedded_extension_options() { FeatureSwitch* FeatureSwitch::embedded_extension_options() {
return &g_common_switches.Get().embedded_extension_options; return &g_common_switches.Get().embedded_extension_options;
} }
......
...@@ -30,7 +30,6 @@ class FeatureSwitch { ...@@ -30,7 +30,6 @@ class FeatureSwitch {
public: public:
static FeatureSwitch* force_dev_mode_highlighting(); static FeatureSwitch* force_dev_mode_highlighting();
static FeatureSwitch* prompt_for_external_extensions(); static FeatureSwitch* prompt_for_external_extensions();
static FeatureSwitch* error_console();
static FeatureSwitch* embedded_extension_options(); static FeatureSwitch* embedded_extension_options();
static FeatureSwitch* trace_app_source(); static FeatureSwitch* trace_app_source();
static FeatureSwitch* load_media_router_component_extension(); static FeatureSwitch* load_media_router_component_extension();
......
...@@ -35,10 +35,6 @@ const char kEnableExperimentalExtensionApis[] = ...@@ -35,10 +35,6 @@ const char kEnableExperimentalExtensionApis[] =
const char kDisableExtensionsHttpThrottling[] = const char kDisableExtensionsHttpThrottling[] =
"disable-extensions-http-throttling"; "disable-extensions-http-throttling";
// Allows the ErrorConsole to collect runtime and manifest errors, and display
// them in the chrome:extensions page.
const char kErrorConsole[] = "error-console";
// Marks a renderer as extension process. // Marks a renderer as extension process.
const char kExtensionProcess[] = "extension-process"; const char kExtensionProcess[] = "extension-process";
......
...@@ -18,7 +18,6 @@ extern const char kDisableExtensionsHttpThrottling[]; ...@@ -18,7 +18,6 @@ extern const char kDisableExtensionsHttpThrottling[];
extern const char kEmbeddedExtensionOptions[]; extern const char kEmbeddedExtensionOptions[];
extern const char kEnableExperimentalExtensionApis[]; extern const char kEnableExperimentalExtensionApis[];
extern const char kEnableBLEAdvertising[]; extern const char kEnableBLEAdvertising[];
extern const char kErrorConsole[];
extern const char kExtensionProcess[]; extern const char kExtensionProcess[];
extern const char kExtensionsOnChromeURLs[]; extern const char kExtensionsOnChromeURLs[];
extern const char kForceDevModeHighlighting[]; extern const char kForceDevModeHighlighting[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment