Implement new strategy for default apps

chrome/common/extensions/extension_manifests_unittest.cc

Index: chrome/common/extensions/extension_manifests_unittest.cc
diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
index 5cdd909fb021b6a5524483232fc7dfc0a33df728..9a660bcd77724c157d810dabbaa3540a0c2483cc 100644
--- a/chrome/common/extensions/extension_manifests_unittest.cc
+++ b/chrome/common/extensions/extension_manifests_unittest.cc
@@ -46,7 +46,6 @@ class ExtensionManifestTest : public testing::Test {
 
     scoped_ptr<Extension> extension(new Extension(path.DirName()));
     extension->set_location(location);
-    extension->set_apps_enabled(enable_apps_);
 
     if (!extension->InitFromValue(*value, false, error))
       return NULL;
@@ -119,17 +118,6 @@ class ExtensionManifestTest : public testing::Test {
   bool enable_apps_;
 };
 
-TEST_F(ExtensionManifestTest, AppsDisabledByDefault) {
-#if defined(OS_CHROMEOS)
-  // On ChromeOS, apps are enabled by default.
-  if (Extension::AppsAreEnabled())
-    return;
-#endif
-
-  enable_apps_ = false;
-  LoadAndExpectError("launch_local_path.json", errors::kAppsNotEnabled);
-}
-
 TEST_F(ExtensionManifestTest, ValidApp) {
   scoped_ptr<Extension> extension(LoadAndExpectSuccess("valid_app.json"));
   ASSERT_EQ(2u, extension->web_extent().patterns().size());