6 files changed, 0 insertions, 58 deletions
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index ce72d32..973f989 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -120,7 +120,6 @@ void ChromeBrowserFieldTrials::SetupFieldTrials(bool proxy_policy_is_set) {
   PredictorFieldTrial();
   AutoLaunchChromeFieldTrial();
   gpu_util::InitializeCompositingFieldTrial();
-  gpu_util::InitializeStage3DFieldTrial();
   SetupUniformityFieldTrials();
   AutocompleteFieldTrial::Activate();
   DisableNewTabFieldTrialIfNecesssary();
diff --git a/chrome/browser/chrome_gpu_util.cc b/chrome/browser/chrome_gpu_util.cc
index 524def6..c3b1434 100644
--- a/chrome/browser/chrome_gpu_util.cc
+++ b/chrome/browser/chrome_gpu_util.cc
@@ -85,43 +85,6 @@ void UninstallBrowserMonitor() {
 
 #endif // !defined(OS_ANDROID)
 
-bool ShouldRunStage3DFieldTrial() {
-#if !defined(OS_WIN)
-  return false;
-#else
-  if (base::win::GetVersion() >= base::win::VERSION_VISTA)
-    return false;
-  return true;
-#endif
-}
-
-void InitializeStage3DFieldTrial() {
-  if (!ShouldRunStage3DFieldTrial()) {
-    base::FieldTrial* trial =
-        base::FieldTrialList::Find(content::kStage3DFieldTrialName);
-    if (trial)
-      trial->Disable();
-    return;
-  }
-
-  const base::FieldTrial::Probability kDivisor = 1000;
-  scoped_refptr<base::FieldTrial> trial(
-    base::FieldTrialList::FactoryGetFieldTrial(
-        content::kStage3DFieldTrialName, kDivisor,
-        content::kStage3DFieldTrialEnabledName, 2013, 3, 1, NULL));
-
-  // Produce the same result on every run of this client.
-  trial->UseOneTimeRandomization();
-
-  // Kill-switch, so disabled unless we get info from server.
-  int blacklisted_group = trial->AppendGroup(
-      content::kStage3DFieldTrialBlacklistedName, kDivisor);
-
-  bool enabled = (trial->group() != blacklisted_group);
-
-  UMA_HISTOGRAM_BOOLEAN("GPU.Stage3DFieldTrial", enabled);
-}
-
 void DisableCompositingFieldTrial() {
   base::FieldTrial* trial =
       base::FieldTrialList::Find(content::kGpuCompositingFieldTrialName);
diff --git a/chrome/browser/chrome_gpu_util.h b/chrome/browser/chrome_gpu_util.h
index e7da930..3245e25 100644
--- a/chrome/browser/chrome_gpu_util.h
+++ b/chrome/browser/chrome_gpu_util.h
@@ -15,9 +15,6 @@ void InstallBrowserMonitor();
 void UninstallBrowserMonitor();
 #endif // !defined(OS_ANDROID)
 
-// Sets up Stage3D on XP field trial
-void InitializeStage3DFieldTrial();
-
 // Sets up force-compositing-mode and threaded compositing field trials.
 void InitializeCompositingFieldTrial();
 
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 42a3bc3..08c4f77 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -505,12 +505,6 @@ void GpuDataManagerImpl::UpdateVideoMemoryUsageStats(
                          video_memory_usage_stats);
 }
 
-// Experiment to determine whether Stage3D should be blacklisted on XP.
-bool Stage3DBlacklisted() {
-  return base::FieldTrialList::FindFullName(content::kStage3DFieldTrialName) ==
-      content::kStage3DFieldTrialBlacklistedName;
-}
-
 void GpuDataManagerImpl::UpdateBlacklistedFeatures(
     GpuFeatureType features) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -526,9 +520,6 @@ void GpuDataManagerImpl::UpdateBlacklistedFeatures(
       command_line->HasSwitch(switches::kBlacklistWebGL)) {
     flags |= content::GPU_FEATURE_TYPE_WEBGL;
   }
-  if (Stage3DBlacklisted()) {
-    flags |= content::GPU_FEATURE_TYPE_FLASH_STAGE3D;
-  }
   blacklisted_features_ = static_cast<GpuFeatureType>(flags);
 
   EnableSoftwareRenderingIfNecessary();
diff --git a/content/public/common/content_constants.cc b/content/public/common/content_constants.cc
index 1b82375..66cd854 100644
--- a/content/public/common/content_constants.cc
+++ b/content/public/common/content_constants.cc
@@ -36,8 +36,4 @@ const char kGpuCompositingFieldTrialName[] = "ForceCompositingMode";
 const char kGpuCompositingFieldTrialForceCompositingEnabledName[] = "enabled";
 const char kGpuCompositingFieldTrialThreadEnabledName[] = "thread";
 
-const char kStage3DFieldTrialName[] = "EnableStage3D";
-const char kStage3DFieldTrialBlacklistedName[] = "blacklisted";
-const char kStage3DFieldTrialEnabledName[] = "enabled";
-
 }  // namespace content
diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h
index 543660a..9097181 100644
--- a/content/public/common/content_constants.h
+++ b/content/public/common/content_constants.h
@@ -58,10 +58,6 @@ CONTENT_EXPORT extern const char
     kGpuCompositingFieldTrialForceCompositingEnabledName[];
 CONTENT_EXPORT extern const char kGpuCompositingFieldTrialThreadEnabledName[];
 
-CONTENT_EXPORT extern const char kStage3DFieldTrialName[];
-CONTENT_EXPORT extern const char kStage3DFieldTrialBlacklistedName[];
-CONTENT_EXPORT extern const char kStage3DFieldTrialEnabledName[];
-
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_CONSTANTS_H_