Index: chrome/common/pepper_flash.cc |
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc |
index d443625e80078d587bd6a056e415eb0fb045acda..519250f7e07f646e5f66d19196063b456ddbc0fc 100644 |
--- a/chrome/common/pepper_flash.cc |
+++ b/chrome/common/pepper_flash.cc |
@@ -6,35 +6,8 @@ |
#include "ppapi/shared_impl/ppapi_permissions.h" |
-bool ConductingPepperFlashFieldTrial() { |
-#if defined(OS_WIN) |
- return true; |
-#elif defined(OS_MACOSX) |
- return true; |
-#else |
- return false; |
-#endif |
-} |
- |
-bool IsPepperFlashEnabledByDefault() { |
-#if defined(USE_AURA) |
- // Pepper Flash is required for Aura (on any OS). |
- return true; |
-#elif defined(OS_WIN) |
- return true; |
-#elif defined(OS_LINUX) |
- // For Linux, always try to use it (availability is checked elsewhere). |
- return true; |
-#elif defined(OS_MACOSX) |
- return true; |
-#else |
- return false; |
-#endif |
-} |
- |
int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | |
ppapi::PERMISSION_PRIVATE | |
ppapi::PERMISSION_BYPASS_USER_GESTURE | |
ppapi::PERMISSION_FLASH; |
- |