Move gpu blacklist data file to content side.

chrome/browser/chrome_gpu_util.cc

Index: chrome/browser/chrome_gpu_util.cc
===================================================================
--- chrome/browser/chrome_gpu_util.cc	(revision 156701)
+++ chrome/browser/chrome_gpu_util.cc	(working copy)
@@ -16,8 +16,6 @@
 #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;
 
@@ -125,23 +123,12 @@
 // Load GPU Blacklist, collect preliminary gpu info, and compute preliminary
 // gpu feature flags.
 void InitializeGpuDataManager(const CommandLine& command_line) {

[jam, 2012/09/19 20:09:57]

now that the blacklist is in content, this should be there as well, so that not
every embedder has to do this.

[Zhenyao Mo, 2012/09/19 22:46:19]

The chrome version has to be collected on the chrome side, so we still need the
code to be on this side.

[jam, 2012/09/20 01:09:09]

the chrome version is already accessible through
content::GetContentClient()->GetProduct()

-  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();
+  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);
+  content::GpuDataManager::GetInstance()->Initialize(chrome_version_string);
 }
 
 }  // namespace gpu_util;