Block NPAPI plug-ins in Metro mode instead of not loading them at all.

webkit/plugins/npapi/plugin_list_win.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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "base/win/metro.h"
 #include "base/win/pe_image.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/plugin_switches.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace webkit {
@@ skipping 353 matching lines @@
     int major, minor, update;
     if (ver.size() == 4 &&
         base::StringToInt(ver[0], &major) &&
         base::StringToInt(ver[1], &minor) &&
         base::StringToInt(ver[2], &update)) {
       if (major == 6 && minor == 0 && update < 120)
         return false;  // Java SE6 Update 11 or older.
     }
   }
 
-  if (base::win::IsMetroProcess()) {
-    // In metro mode we only allow pepper plugins.
-    if (info.type == WebPluginInfo::PLUGIN_TYPE_NPAPI)
-      return false;
-  }
-
   // Special WMP handling
 
   // If both the new and old WMP plugins exist, only load the new one.
   if (filename == kNewWMPPlugin) {
     if (dont_load_new_wmp_)
       return false;
 
     for (size_t j = 0; j < plugins->size(); ++j) {
       if ((*plugins)[j].path.BaseName().value() == kOldWMPPlugin) {
         PluginList::RemovePlugin((*plugins)[j].path, plugins);
@@ skipping 19 matching lines @@
     if (file_util::PathExists(info.path) && (!IsValid32BitImage(info.path)))
       load_plugin = false;
     break;
   }
   return load_plugin;
 }
 
 
 }  // namespace npapi
 }  // namespace webkit