Implement new strategy for default apps

chrome/common/extensions/extension_manifests_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 28 matching lines @@
 
   Extension* LoadExtensionWithLocation(DictionaryValue* value,
                                        Extension::Location location,
                                        std::string* error) {
     FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
     path = path.AppendASCII("extensions").AppendASCII("manifest_tests");
 
     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;
 
     return extension.release();
   }
 
   Extension* LoadExtension(const std::string& name,
                            std::string* error) {
     return LoadExtensionWithLocation(name, Extension::INTERNAL, error);
@@ skipping 52 matching lines @@
                           const std::string& name,
                           const std::string& expected_error) {
     std::string error;
     scoped_ptr<Extension> extension(LoadExtension(manifest, &error));
     VerifyExpectedError(extension.get(), name, error, expected_error);
   }
 
   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());
   EXPECT_EQ("http://www.google.com/mail/*",
             extension->web_extent().patterns()[0].GetAsString());
   EXPECT_EQ("http://www.google.com/foobar/*",
             extension->web_extent().patterns()[1].GetAsString());
   EXPECT_EQ(extension_misc::LAUNCH_TAB, extension->launch_container());
   EXPECT_EQ("http://www.google.com/mail/", extension->launch_web_url());
 }
@@ skipping 194 matching lines @@
 }
 
 TEST_F(ExtensionManifestTest, NormalizeIconPaths) {
   scoped_ptr<Extension> extension(
       LoadAndExpectSuccess("normalize_icon_paths.json"));
   EXPECT_EQ("16.png",
             extension->icons().Get(16, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("48.png",
             extension->icons().Get(48, ExtensionIconSet::MATCH_EXACTLY));
 }