Remove NPAPI support from Chrome Frame.

chrome_frame/utils.h

Index: chrome_frame/utils.h
===================================================================
--- chrome_frame/utils.h	(revision 90713)
+++ chrome_frame/utils.h	(working copy)
@@ -34,7 +34,6 @@
 extern const wchar_t kChromeFrameUnpinnedMode[];
 extern const wchar_t kAllowUnsafeURLs[];
 extern const wchar_t kEnableBuggyBhoIntercept[];
-extern const wchar_t kEnableFirefoxPrivilegeMode[];
 extern const wchar_t kChromeMimeType[];
 extern const wchar_t kChromeFrameAttachTabPattern[];
 extern const wchar_t kChromeFrameConfigKey[];
@@ -74,16 +73,10 @@
 HRESULT UtilUnRegisterTypeLib(ITypeLib* typelib,
                               bool for_current_user_only);
 
-// Utility function to tell if the NPAPI plugin is registered.
-bool UtilIsNPAPIPluginRegistered();
+// Clears a marker that causes NPAPI registration to persist across updates.

[robertshield, 2011/06/28 20:49:35]

nit: causes *legacy* NPAPI registration

[grt (UTC plus 2), 2011/06/28 20:57:38]

Done.

+// Returns false if the marker could not be removed.
+bool UtilRemovePersistentNPAPIMarker();
 
-// Sets or clears a marker that causes NPAPI registration to persist across
-// updates. The marker is added if set is true and is deleted otherwise.
-bool UtilChangePersistentNPAPIMarker(bool set);
-
-// Returns true if the persistent NPAPI marker is set, false otherwise.
-bool UtilIsPersistentNPAPIMarkerSet();
-
 // Given an HTML fragment, this function looks for the
 // <meta http-equiv="X-UA-Compatible"> tag and extracts the value of the
 // "content" attribute
@@ -156,8 +149,6 @@
   BROWSER_INVALID = -1,
   BROWSER_UNKNOWN,
   BROWSER_IE,
-  BROWSER_FIREFOX,
-  BROWSER_OPERA,
 };
 
 BrowserType GetBrowserType();