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

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

Issue 916243002: Enable keyboard shortcuts for chrome://extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Attempt to fix trybots Created 5 years, 10 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 111f8d226f4cd279a349b02b6b91470b3942b384..5c00573b5c6cfe6fd1705d22dcc845610e5b5ca2 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -26,6 +26,7 @@
#include "content/public/test/test_utils.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
+#include "extensions/browser/test_extension_registry_observer.h"
#include "extensions/common/extension_set.h"
using extensions::Extension;
@@ -59,7 +60,20 @@ void ExtensionSettingsUIBrowserTest::InstallGoodExtension() {
return;
}
base::FilePath extensions_data_dir = test_data_dir.AppendASCII("extensions");
- InstallExtension(extensions_data_dir.AppendASCII("good.crx"));
+ EXPECT_TRUE(InstallExtension(extensions_data_dir.AppendASCII("good.crx")));
+}
+
+void ExtensionSettingsUIBrowserTest::InstallErrorsExtension() {
+ base::FilePath test_data_dir;
+ if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) {
+ ADD_FAILURE();
+ return;
+ }
+ base::FilePath extensions_data_dir = test_data_dir.AppendASCII("extensions");
+ extensions_data_dir = extensions_data_dir.AppendASCII("error_console");
+ EXPECT_TRUE(InstallUnpackedExtension(
+ extensions_data_dir.AppendASCII("runtime_and_manifest_errors"),
+ "pdlpifnclfacjobnmbpngemkalkjamnf"));
}
void ExtensionSettingsUIBrowserTest::AddManagedPolicyProvider() {
@@ -81,9 +95,32 @@ class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
}
};
+const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension(
+ const base::FilePath& path, const char* id) {
+ if (path.empty())
+ return NULL;
+
+ Profile* profile = GetProfile();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ extensions::ExtensionRegistry* registry =
+ extensions::ExtensionRegistry::Get(profile);
+ service->set_show_extensions_prompts(false);
Dan Beam 2015/02/24 00:55:38 nit: reverse these ^^ two lines, e.g., Extensio
hcarmona 2015/02/24 02:49:44 Done.
+
+ extensions::TestExtensionRegistryObserver observer(registry, id);
Dan Beam 2015/02/24 02:40:49 i think this class auto registers itself as an obs
hcarmona 2015/02/24 02:49:44 Awesome, thanks! Done.
+ registry->AddObserver(&observer);
+
+ extensions::UnpackedInstaller::Create(service)->Load(path);
+
+ // Test will timeout if extension is not loaded.
+ observer.WaitForExtensionLoaded();
+ registry->RemoveObserver(&observer);
+ return service->GetExtensionById(last_loaded_extension_id(), false);
+}
+
const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
const base::FilePath& path) {
- Profile* profile = this->GetProfile();
+ Profile* profile = GetProfile();
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
extensions::ExtensionRegistry* registry =

Powered by Google App Engine
This is Rietveld 408576698