Revert 155218 - Move gpu blacklist to content side.

chrome/browser/chrome_gpu_util.cc

Index: chrome/browser/chrome_gpu_util.cc
===================================================================
--- chrome/browser/chrome_gpu_util.cc	(revision 155222)
+++ chrome/browser/chrome_gpu_util.cc	(working copy)
@@ -1,123 +0,0 @@
-// 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/browser/chrome_gpu_util.h"
-
-#include "base/command_line.h"
-#include "base/metrics/field_trial.h"
-#include "base/metrics/histogram.h"
-#include "base/version.h"
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
-#include "content/public/browser/gpu_data_manager.h"
-#include "content/public/common/content_constants.h"
-#include "content/public/common/content_switches.h"
-#include "grit/browser_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-
-using content::GpuDataManager;
-
-namespace gpu_util {
-
-void InitializeCompositingFieldTrial() {
-// Enable the field trial only on desktop OS's.
-#if !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
-  return;
-#endif
-#if defined(OS_WIN)
-  // Don't run the trial on Windows XP.
-  if (base::win::GetVersion() < base::win::VERSION_VISTA)
-    return;
-#endif
-
-  // The performance of accelerated compositing is too low with software
-  // rendering.
-  if (content::GpuDataManager::GetInstance()->ShouldUseSoftwareRendering())
-    return;
-
-  // Don't activate the field trial if force-compositing-mode has been
-  // explicitly disabled from the command line.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableForceCompositingMode))
-    return;
-
-  const base::FieldTrial::Probability kDivisor = 3;
-  scoped_refptr<base::FieldTrial> trial(
-    base::FieldTrialList::FactoryGetFieldTrial(
-        content::kGpuCompositingFieldTrialName, kDivisor,
-        "disable", 2012, 12, 31, NULL));
-
-  // Produce the same result on every run of this client.
-  trial->UseOneTimeRandomization();
-
-  base::FieldTrial::Probability force_compositing_mode_probability = 0;
-  base::FieldTrial::Probability threaded_compositing_probability = 0;
-
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
-      channel == chrome::VersionInfo::CHANNEL_BETA) {
-    // Stable and Beta channels: Non-threaded force-compositing-mode on by
-    // default (mac and windows only).
-#if defined(OS_WIN) || defined(OS_MACOSX)
-    force_compositing_mode_probability = 3;
-#endif
-  } else if (channel == chrome::VersionInfo::CHANNEL_DEV ||
-             channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    // Dev and Canary channels: force-compositing-mode and
-    // threaded-compositing on with 1/3 probability each.
-    force_compositing_mode_probability = 1;
-
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-    // Threaded compositing mode isn't feature complete on mac or linux yet:
-    // http://crbug.com/133602 for mac
-    // http://crbug.com/140866 for linux
-    threaded_compositing_probability = 0;
-#else
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableThreadedCompositing))
-        threaded_compositing_probability = 1;
-#endif
-  }
-
-  int force_compositing_group = trial->AppendGroup(
-      content::kGpuCompositingFieldTrialForceCompositingEnabledName,
-      force_compositing_mode_probability);
-  int thread_group = trial->AppendGroup(
-      content::kGpuCompositingFieldTrialThreadEnabledName,
-      threaded_compositing_probability);
-
-  bool force_compositing = (trial->group() == force_compositing_group);
-  bool thread = (trial->group() == thread_group);
-  UMA_HISTOGRAM_BOOLEAN("GPU.InForceCompositingModeFieldTrial",
-                        force_compositing);
-  UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread);
-}
-
-// Load GPU Blacklist, collect preliminary gpu info, and compute preliminary
-// gpu feature flags.
-void InitializeGpuDataManager(const CommandLine& command_line) {
-  if (command_line.HasSwitch(switches::kSkipGpuDataLoading))
-    return;
-
-  std::string chrome_version_string = "0";
-  std::string gpu_blacklist_json_string;
-  if (!command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) {
-    chrome::VersionInfo chrome_version_info;
-    if (chrome_version_info.is_valid())
-        chrome_version_string = chrome_version_info.Version();
-
-    const base::StringPiece gpu_blacklist_json(
-        ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_GPU_BLACKLIST, ui::SCALE_FACTOR_NONE));
-    gpu_blacklist_json_string = gpu_blacklist_json.as_string();
-  }
-  content::GpuDataManager::GetInstance()->Initialize(
-      chrome_version_string, gpu_blacklist_json_string);
-}
-
-}  // namespace gpu_util;
-