Revert 155218 - Move gpu blacklist to content side.

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc	(revision 155222)
+++ chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
+#include "chrome/browser/gpu_blacklist.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -66,7 +67,10 @@
   }
 
   void SetupBlacklist(const std::string& json_blacklist) {
-    GpuDataManager::GetInstance()->Initialize("0", json_blacklist);
+    GpuBlacklist* blacklist = GpuBlacklist::GetInstance();
+    ASSERT_TRUE(blacklist->LoadGpuBlacklist(
+        json_blacklist, GpuBlacklist::kAllOs));
+    blacklist->UpdateGpuDataManager();
   }
 
   // If expected_reply is NULL, we don't check the reply content.