[OSX] All Flapper, all the time.

chrome/common/pepper_flash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pepper_flash.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
@@ skipping 52 matching lines @@
   return group != base::FieldTrial::kNotFinalized &&
          group != g_disabled_group_number;
 }
 
 }  // namespace
 
 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
 }
 
 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)
-  // 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
 }
 
 int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV |
                                 ppapi::PERMISSION_PRIVATE |
                                 ppapi::PERMISSION_BYPASS_USER_GESTURE;