[Extensions] Move Extension::DisableReason to its own file
Bug:
Change-Id: I513ed197833c01fabe099d7d4df862b9f89c3e57
Move DisableReason enum out of the Extension class to its own file in
extensions/common/disable_reason.h. This allows sources to depend on the
disable reason enum without needing to depend on the Extension class
directly.
Change-Id: I513ed197833c01fabe099d7d4df862b9f89c3e57
Reviewed-on: https://chromium-review.googlesource.com/606553
Commit-Queue: Minh Nguyen <[email protected]>
Reviewed-by: Ilya Sherman <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Nicolas Zea <[email protected]>
Reviewed-by: Devlin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#495694}diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index b3945aff..256abe8 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -499,7 +499,7 @@
EXPECT_TRUE(unload_observer.WaitForUnload(id));
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
int reasons = prefs->GetDisableReasons(id);
- EXPECT_TRUE(reasons & Extension::DISABLE_CORRUPTED);
+ EXPECT_TRUE(reasons & disable_reason::DISABLE_CORRUPTED);
}
void TestContentScriptExtension(const std::string& crx_relpath,
@@ -660,13 +660,13 @@
EXPECT_TRUE(registry_observer.WaitForUnload(id));
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
int reasons = prefs->GetDisableReasons(id);
- EXPECT_TRUE(reasons & Extension::DISABLE_CORRUPTED);
+ EXPECT_TRUE(reasons & disable_reason::DISABLE_CORRUPTED);
// Make sure the extension then got re-installed, and that after reinstall it
// is no longer disabled due to corruption.
EXPECT_TRUE(registry_observer.WaitForInstall(id));
reasons = prefs->GetDisableReasons(id);
- EXPECT_FALSE(reasons & Extension::DISABLE_CORRUPTED);
+ EXPECT_FALSE(reasons & disable_reason::DISABLE_CORRUPTED);
// Make sure that the update check request properly included a parameter
// indicating that this was a corrupt policy reinstall.
@@ -745,7 +745,7 @@
EXPECT_TRUE(registry_observer.WaitForUnload(id_));
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
int reasons = prefs->GetDisableReasons(id_);
- EXPECT_TRUE(reasons & Extension::DISABLE_CORRUPTED);
+ EXPECT_TRUE(reasons & disable_reason::DISABLE_CORRUPTED);
}
// Now actually test what happens on the next startup after the PRE test above.
@@ -758,12 +758,12 @@
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
int disable_reasons = prefs->GetDisableReasons(id_);
- if (disable_reasons & Extension::DISABLE_CORRUPTED) {
+ if (disable_reasons & disable_reason::DISABLE_CORRUPTED) {
RegistryObserver registry_observer(registry);
EXPECT_TRUE(registry_observer.WaitForInstall(id_));
disable_reasons = prefs->GetDisableReasons(id_);
}
- EXPECT_FALSE(disable_reasons & Extension::DISABLE_CORRUPTED);
+ EXPECT_FALSE(disable_reasons & disable_reason::DISABLE_CORRUPTED);
EXPECT_TRUE(registry->enabled_extensions().Contains(id_));
}
