Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 912a3745b78b939b10abfc4554f6241595120b82..2f6cdec66c99ebcf3a60ff2b7cf58c5e1b9532ec 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -208,24 +208,12 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) { |
return false; |
} |
-#if defined(ENABLE_PLUGINS) |
-const char* kPredefinedAllowedFileHandleOrigins[] = { |
- "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789 |
- "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/234789 |
-}; |
-#endif |
- |
} // namespace |
namespace chrome { |
ChromeContentRendererClient::ChromeContentRendererClient() { |
g_current_client = this; |
- |
-#if defined(ENABLE_PLUGINS) |
- for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) |
- allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); |
-#endif |
} |
ChromeContentRendererClient::~ChromeContentRendererClient() { |
@@ -1303,23 +1291,6 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin( |
return module_name == "Native Client"; |
} |
-bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle( |
- WebKit::WebPluginContainer* container) { |
-#if defined(ENABLE_PLUGINS) |
- if (!container) |
- return false; |
- GURL url = container->element().document().baseURL(); |
- const ExtensionSet* extension_set = extension_dispatcher_->extensions(); |
- |
- return IsExtensionOrSharedModuleWhitelisted(url, extension_set, |
- allowed_file_handle_origins_) || |
- IsHostAllowedByCommandLine(url, extension_set, |
- switches::kAllowNaClFileHandleAPI); |
-#else |
- return false; |
-#endif |
-} |
- |
WebKit::WebSpeechSynthesizer* |
ChromeContentRendererClient::OverrideSpeechSynthesizer( |
WebKit::WebSpeechSynthesizerClient* client) { |