Block NPAPI plugins by default

content/browser/plugin_service_impl.h

 // 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 
@@ skipping 90 matching lines @@
   virtual void RefreshPlugins() override;
   virtual void AddExtraPluginPath(const base::FilePath& path) override;
   virtual void RemoveExtraPluginPath(const base::FilePath& path) override;
   virtual void AddExtraPluginDir(const base::FilePath& path) override;
   virtual void RegisterInternalPlugin(
       const WebPluginInfo& info, bool add_at_beginning) override;
   virtual void UnregisterInternalPlugin(const base::FilePath& path) override;
   virtual void GetInternalPlugins(
       std::vector<WebPluginInfo>* plugins) override;
   virtual bool NPAPIPluginsSupported() override;
+#if defined(OS_WIN) || defined(OS_MACOSX)

[jam, 2014/10/16 22:10:57]

do we really need these ifdefs everywhere? why not just take them out and
default to false elsewhere?

[Will Harris, 2014/10/17 18:57:08]

Done.

+  virtual void EnableNpapiPluginsForTesting() override;
+#endif
   virtual void DisablePluginsDiscoveryForTesting() override;
 #if defined(OS_MACOSX)
   virtual void AppActivated() override;
 #elif defined(OS_WIN)
   virtual bool GetPluginInfoFromWindow(HWND window,
                                        base::string16* plugin_name,
                                        base::string16* plugin_version) override;
 
   // Returns true iff the given HWND is a plugin.
   bool IsPluginWindow(HWND window);
@@ skipping 102 matching lines @@
 #if defined(OS_WIN)
   // Registry keys for getting notifications when new plugins are installed.
   base::win::RegKey hkcu_key_;
   base::win::RegKey hklm_key_;
   scoped_ptr<base::WaitableEvent> hkcu_event_;
   scoped_ptr<base::WaitableEvent> hklm_event_;
   base::WaitableEventWatcher hkcu_watcher_;
   base::WaitableEventWatcher hklm_watcher_;
 #endif
 
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  bool npapi_plugins_enabled_;
+#endif
+
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
   ScopedVector<base::FilePathWatcher> file_watchers_;
 #endif
 
   std::vector<PepperPluginInfo> ppapi_plugins_;
 
   // Weak pointer; outlives us.
   PluginServiceFilter* filter_;
 
   std::set<PluginProcessHost::Client*> pending_plugin_clients_;
 
   // Used to sequentialize loading plug-ins from disk.
   base::SequencedWorkerPool::SequenceToken plugin_list_token_;
 
 #if defined(OS_POSIX)
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
   // Used to detect if a given plug-in is crashing over and over.
   std::map<base::FilePath, std::vector<base::Time> > crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_