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

Unified Diff: chrome/browser/extensions/api/management/management_api_browsertest.cc

Issue 10912105: Allow chrome.management.setEnabled() to re-enable crashed extensions. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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/api/management/management_api_browsertest.cc
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index 86841564b186df7a26946afb6e9eee02a4d2861e..84c1b45e799ff316cda51407329749e58182e73a 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -222,16 +222,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
SetEnabled(true, true, "");
- // Crash the extension and try to enable. The extension should be reloaded and
- // enabled.
- ASSERT_TRUE(CrashEnabledExtension(kId));
- SetEnabled(true, true, "");
-
- // Crash the extension again and try to disable. This call should be a no-op
- // and the extension should remain unloaded.
+ // Crash the extension. Mock a reload by disabling and then enabling. The
+ // extension should be reloaded and enabled.
ASSERT_TRUE(CrashEnabledExtension(kId));
SetEnabled(false, true, "");
+ SetEnabled(true, true, "");
const extensions::Extension* extension = browser()->profile()->
- GetExtensionService()->GetTerminatedExtension(kId);
- ASSERT_TRUE(extension);
+ GetExtensionService()->GetExtensionById(kId, false);
+ EXPECT_TRUE(extension);
}
« no previous file with comments | « chrome/browser/extensions/api/management/management_api.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698