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 946687896a4ca4f7bb1b39ec9612a3b7c13c485b..c49da3c3b6f7019c901da3b18b7da5b7c6d87969 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -1480,7 +1480,11 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseCompositorAPI( |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnablePepperTesting)) |
return true; |
- return IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_); |
+ if (IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_)) |
+ return true; |
+ |
+ chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
+ return channel <= chrome::VersionInfo::CHANNEL_DEV; |
#else |
return false; |
#endif |
@@ -1492,8 +1496,12 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseVideoDecodeAPI( |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnablePepperTesting)) |
return true; |
- return IsExtensionOrSharedModuleWhitelisted(url, |
- allowed_video_decode_origins_); |
+ |
+ 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 |