[OSX] All Flapper, all the time.

chrome/common/pepper_flash.cc

Index: chrome/common/pepper_flash.cc
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc
index c6148895f671823990122b7a97da4ec8b8e03e21..ddaf733ccc20ef894beb37841b9bf16bc18da0d8 100644
--- a/chrome/common/pepper_flash.cc
+++ b/chrome/common/pepper_flash.cc
@@ -70,17 +70,7 @@ bool ConductingPepperFlashFieldTrial() {
 #if defined(OS_WIN)
   return true;
 #elif defined(OS_MACOSX)
-  // Returning |true| here puts PepperFlash in the plugin list, by
-  // default after the built-in NPAPI Flash.  Returning |true| from
-  // IsPepperFlashEnabledByDefault() puts PepperFlash above NPAPI
-  // Flash.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
-      channel == chrome::VersionInfo::CHANNEL_DEV)
-    return true;
-
-  // TODO(shess): Don't expose for other channels, yet.
-  return false;
+  return true;
 #else
   return false;
 #endif
@@ -96,14 +86,7 @@ bool IsPepperFlashEnabledByDefault() {
   // For Linux, always try to use it (availability is checked elsewhere).
   return true;
 #elif defined(OS_MACOSX)
-  // PepperFlash is the default for CANARY and DEV.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
-      channel == chrome::VersionInfo::CHANNEL_DEV)
-    return true;
-
-  // PepperFlash is opt-in on any other channels where it is exposed.
-  return false;
+  return true;
 #else
   return false;
 #endif