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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc

Issue 1132493004: Enable extensions error button test that was failing on stable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply feedback Created 5 years, 7 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/ui/webui/extensions/extension_settings_browsertest.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index 16cc98fa60ca2d5f9d8ba837c916e12e4597166f..aef43a8b078c4ffc4ed7d746f205caaa4842aaf5 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -34,7 +34,7 @@ using extensions::Extension;
using extensions::TestManagementPolicyProvider;
ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest()
- : profile_(NULL),
+ : profile_(nullptr),
policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS |
TestManagementPolicyProvider::MUST_REMAIN_ENABLED |
TestManagementPolicyProvider::MUST_REMAIN_INSTALLED) {
@@ -90,6 +90,11 @@ void ExtensionSettingsUIBrowserTest::SetAutoConfirmUninstall() {
extensions::ManagementUninstallFunctionBase::SetAutoConfirmForTest(true);
}
+void ExtensionSettingsUIBrowserTest::EnableErrorConsole() {
+ error_console_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
+ extensions::FeatureSwitch::error_console(), true));
+}
+
class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
public:
explicit MockAutoConfirmExtensionInstallPrompt(
@@ -107,7 +112,7 @@ class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension(
const base::FilePath& path) {
if (path.empty())
- return NULL;
+ return nullptr;
Profile* profile = GetProfile();
ExtensionService* service =
@@ -143,7 +148,7 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
base::FilePath crx_path = path;
DCHECK(crx_path.Extension() == FILE_PATH_LITERAL(".crx"));
if (crx_path.empty())
- return NULL;
+ return nullptr;
scoped_refptr<extensions::CrxInstaller> installer(
extensions::CrxInstaller::Create(service, install_ui.Pass()));
@@ -180,10 +185,10 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
iter != errors->end(); ++iter)
VLOG(1) << *iter;
- return NULL;
+ return nullptr;
}
if (!observer_->WaitForExtensionViewsToLoad())
- return NULL;
+ return nullptr;
return service->GetExtensionById(last_loaded_extension_id(), false);
}

Powered by Google App Engine
This is Rietveld 408576698