| Index: chrome/renderer/content_settings_observer.h | 
| diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h | 
| index 8e1668606b5220b96bb6d9d9c936e1ea0c373adc..c54a33d65b90fd564118d78db99daa69071b171a 100644 | 
| --- a/chrome/renderer/content_settings_observer.h | 
| +++ b/chrome/renderer/content_settings_observer.h | 
| @@ -85,9 +85,6 @@ class ContentSettingsObserver | 
| const blink::WebSecurityOrigin& context, | 
| const blink::WebURL& url) override; | 
|  | 
| -  // This is used for cases when the NPAPI plugins malfunction if used. | 
| -  bool AreNPAPIPluginsBlocked() const; | 
| - | 
| private: | 
| FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes); | 
| FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, | 
| @@ -102,7 +99,6 @@ class ContentSettingsObserver | 
| // Message handlers. | 
| void OnLoadBlockedPlugins(const std::string& identifier); | 
| void OnSetAsInterstitial(); | 
| -  void OnNPAPINotSupported(); | 
| void OnSetAllowDisplayingInsecureContent(bool allow); | 
| void OnSetAllowRunningInsecureContent(bool allow); | 
| void OnReloadFrame(); | 
| @@ -156,7 +152,6 @@ class ContentSettingsObserver | 
|  | 
| std::set<std::string> temporarily_allowed_plugins_; | 
| bool is_interstitial_page_; | 
| -  bool npapi_plugins_blocked_; | 
|  | 
| int current_request_id_; | 
| typedef std::map<int, blink::WebContentSettingCallbacks> PermissionRequestMap; | 
|  |