summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
diff options
context:
space:
mode:
authorjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-05 01:31:42 +0000
committerjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-05 01:31:42 +0000
commitacdf00955b4c3ee1b0c939aa188209f00841ae99 (patch)
tree48a53adb5dababb706e23ad8bd5d2a7ca4f007fa /chrome/browser/extensions/extension_disabled_ui_browsertest.cc
parente27c7ae476066d813177198fd364c3db6d6ebec4 (diff)
downloadchromium_src-acdf00955b4c3ee1b0c939aa188209f00841ae99.zip
chromium_src-acdf00955b4c3ee1b0c939aa188209f00841ae99.tar.gz
chromium_src-acdf00955b4c3ee1b0c939aa188209f00841ae99.tar.bz2
Disable ExtensionDisabledGlobalErrorTest.UnknownReasonHigherPermissions (incorrectly disabled wrong test previously).
BUG=246431 NOTRY=true TBR=yoz Review URL: https://chromiumcodereview.appspot.com/16395002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_disabled_ui_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_disabled_ui_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
index 22210ae..b00a0dd 100644
--- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -137,9 +137,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, UserDisabled) {
// Test that no error appears if the disable reason is unknown
// (but probably was by the user).
-// Disabled due to http://crbug.com/246431
IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest,
- DISABLED_UnknownReasonSamePermissions) {
+ UnknownReasonSamePermissions) {
const Extension* extension = InstallIncreasingPermissionExtensionV1();
DisableExtension(extension->id());
// Clear disable reason to simulate legacy disables.
@@ -153,8 +152,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest,
// Test that an error appears if the disable reason is unknown
// (but probably was for increased permissions).
+// Disabled due to http://crbug.com/246431
IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest,
- UnknownReasonHigherPermissions) {
+ DISABLED_UnknownReasonHigherPermissions) {
const Extension* extension = InstallAndUpdateIncreasingPermissionsExtension();
// Clear disable reason to simulate legacy disables.
service_->extension_prefs()->ClearDisableReasons(extension->id());