Merge 48149 - Relanding 48042....

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/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 58 matching lines @@
         "Expected failure loading extension '" << name <<
         "', but didn't get one.";
     EXPECT_TRUE(MatchPatternASCII(error, expected_error)) << name <<
         " expected '" << expected_error << "' but got '" << error << "'";
   }
 
   bool enable_apps_;
 };
 
 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);
 }
 
 TEST_F(ManifestTest, ValidApp) {
   scoped_ptr<Extension> extension(LoadAndExpectSuccess("valid_app.json"));
   EXPECT_TRUE(extension->web_content_enabled());
   EXPECT_EQ(GURL("http://www.google.com/"), extension->web_extent().origin());
   EXPECT_EQ(2u, extension->web_extent().paths().size());
@@ skipping 118 matching lines @@
       "permission_chrome_resources_url.json",
       Extension::COMPONENT,
       &error));
   EXPECT_EQ("", error);
 }
 
 TEST_F(ManifestTest, ChromeURLContentScriptInvalid) {
   LoadAndExpectError("content_script_chrome_url_invalid.json",
       errors::kInvalidMatch);
 }