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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension_manifests_unittest.cc

Issue 2206001: Merge 48149 - Relanding 48042.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/408/src/
Patch Set: Created 10 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
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_manifests_unittest.cc
===================================================================
--- chrome/common/extensions/extension_manifests_unittest.cc (revision 48200)
+++ chrome/common/extensions/extension_manifests_unittest.cc (working copy)
@@ -76,6 +76,12 @@
};
TEST_F(ManifestTest, AppsDisabledByDefault) {
+#if defined(OS_CHROMEOS)
+ // On ChromeOS, apps are enabled by default.
+ if (Extension::AppsAreEnabled())
+ return;
+#endif
+
enable_apps_ = false;
LoadAndExpectError("web_content_disabled.json", errors::kAppsNotEnabled);
LoadAndExpectError("launch_local_path.json", errors::kAppsNotEnabled);
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698