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 ff8e5959ca6e2d4cb48a4713840c9e5ad04a3a6b..926ccd36d6a832c5d862790c4984888aaf0c640e 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -209,22 +209,10 @@ 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 |
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() { |
@@ -1304,24 +1292,6 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin( |
return module_name == "Native Client"; |
} |
-bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle( |
- blink::WebPluginContainer* container) { |
-#if defined(ENABLE_PLUGINS) |
- if (!container) |
- return false; |
- GURL url = container->element().document().baseURL(); |
- const ExtensionSet* extension_set = extension_dispatcher_->extensions(); |
- |
- if (chrome::IsExtensionOrSharedModuleWhitelisted( |
- url, extension_set, allowed_file_handle_origins_) || |
- chrome::IsHostAllowedByCommandLine( |
- url, extension_set, switches::kAllowNaClFileHandleAPI)) { |
- return true; |
- } |
-#endif |
- return false; |
-} |
- |
blink::WebSpeechSynthesizer* |
ChromeContentRendererClient::OverrideSpeechSynthesizer( |
blink::WebSpeechSynthesizerClient* client) { |