Revert 158217 - Allow extensions which can run without NPAPI to run under Windows 8 Metro.

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1495 matching lines @@
         new extensions::Command(
             values::kBrowserActionCommandEvent, string16(), ""));
   }
 
   return true;
 }
 
 bool Extension::LoadPlugins(string16* error) {
   if (!manifest_->HasKey(keys::kPlugins))
     return true;
-
   ListValue* list_value = NULL;
   if (!manifest_->GetList(keys::kPlugins, &list_value)) {
     *error = ASCIIToUTF16(errors::kInvalidPlugins);
     return false;
   }
 
   for (size_t i = 0; i < list_value->GetSize(); ++i) {
     DictionaryValue* plugin_value = NULL;
     if (!list_value->GetDictionary(i, &plugin_value)) {
       *error = ASCIIToUTF16(errors::kInvalidPlugins);
@@ skipping 10 matching lines @@
     // Get plugins[i].content (optional).
     bool is_public = false;
     if (plugin_value->HasKey(keys::kPluginsPublic)) {
       if (!plugin_value->GetBoolean(keys::kPluginsPublic, &is_public)) {
         *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
             errors::kInvalidPluginsPublic, base::IntToString(i));
         return false;
       }
     }
 
-    // We don't allow extensions to load NPAPI plugins on Chrome OS, or under
-    // Windows 8 Metro mode, but still parse the entries to display consistent
-    // error messages. If the extension actually requires the plugins then
-    // LoadRequirements will prevent it loading.
 #if defined(OS_CHROMEOS)
-    continue;
-#elif defined(OS_WIN)
+    // We don't allow extension plugins to run on Chrome OS. We still
+    // parse the manifest entry so that error messages are consistently
+    // displayed across platforms.
+#else
+#if defined(OS_WIN)
+    // Like Chrome OS, we don't support NPAPI plugins in Windows 8 metro mode
+    // but in this case we want to fail with an error.
     if (base::win::IsMetroProcess()) {
-      continue;
+      *error = l10n_util::GetStringUTF16(
+          IDS_EXTENSION_INSTALL_PLUGIN_NOT_SUPPORTED);
+      return false;
     }
 #endif  // defined(OS_WIN).
     plugins_.push_back(PluginInfo());
     plugins_.back().path = path().Append(FilePath::FromUTF8Unsafe(path_str));
     plugins_.back().is_public = is_public;
+#endif  // defined(OS_CHROMEOS).
   }
   return true;
 }
 
 bool Extension::LoadNaClModules(string16* error) {
   if (!manifest_->HasKey(keys::kNaClModules))
     return true;
   ListValue* list_value = NULL;
   if (!manifest_->GetList(keys::kNaClModules, &list_value)) {
     *error = ASCIIToUTF16(errors::kInvalidNaClModules);
@@ skipping 107 matching lines @@
     sandboxed_pages_content_security_policy_ =
         kDefaultSandboxedPageContentSecurityPolicy;
     CHECK(ContentSecurityPolicyIsSandboxed(
         sandboxed_pages_content_security_policy_, GetType()));
   }
 
   return true;
 }
 
 bool Extension::LoadRequirements(string16* error) {
-  // Before parsing requirements from the manifest, automatically default the
-  // NPAPI plugin requirement based on whether it includes NPAPI plugins.
-  ListValue* list_value = NULL;
-  requirements_.npapi =
-    manifest_->GetList(keys::kPlugins, &list_value) && !list_value->empty();
+  // If the extension has plugins, then |requirements_.npapi| defaults to true.
+  if (plugins_.size() > 0)
+    requirements_.npapi = true;
 
   if (!manifest_->HasKey(keys::kRequirements))
     return true;
 
   DictionaryValue* requirements_value = NULL;
   if (!manifest_->GetDictionary(keys::kRequirements, &requirements_value)) {
     *error = ASCIIToUTF16(errors::kInvalidRequirements);
     return false;
   }
 
@@ skipping 2322 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions