| 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 941e4ffe0b0ec0ea7e332bd7bcca090a80457f65..0c2c4b05da9cb08265720bef822c901dd7a371a2 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -182,11 +182,6 @@ const char* const kPredefinedAllowedCompositorOrigins[] = {
|
| "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937
|
| "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937
|
| };
|
| -
|
| -const char* const kPredefinedAllowedVideoDecodeOrigins[] = {
|
| - "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937
|
| - "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937
|
| -};
|
| #endif
|
|
|
| void AppendParams(const std::vector<base::string16>& additional_names,
|
| @@ -284,9 +279,6 @@ ChromeContentRendererClient::ChromeContentRendererClient() {
|
| #if defined(ENABLE_PLUGINS)
|
| for (size_t i = 0; i < arraysize(kPredefinedAllowedCompositorOrigins); ++i)
|
| allowed_compositor_origins_.insert(kPredefinedAllowedCompositorOrigins[i]);
|
| - for (size_t i = 0; i < arraysize(kPredefinedAllowedVideoDecodeOrigins); ++i)
|
| - allowed_video_decode_origins_.insert(
|
| - kPredefinedAllowedVideoDecodeOrigins[i]);
|
| #endif
|
| }
|
|
|
| @@ -1584,23 +1576,6 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseCompositorAPI(
|
| #endif
|
| }
|
|
|
| -bool ChromeContentRendererClient::IsPluginAllowedToUseVideoDecodeAPI(
|
| - const GURL& url) {
|
| -#if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnablePepperTesting))
|
| - return true;
|
| -
|
| - if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
|
| - return true;
|
| -
|
| - chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
|
| - return channel <= chrome::VersionInfo::CHANNEL_DEV;
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| content::BrowserPluginDelegate*
|
| ChromeContentRendererClient::CreateBrowserPluginDelegate(
|
| content::RenderFrame* render_frame,
|
|
|