Revert 155218 - Move gpu blacklist to content side.

chrome/test/gpu/gpu_feature_browsertest.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #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"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/test/gpu/gpu_test_config.h"
@@ skipping 38 matching lines @@
 #endif
     } else {
       gpu_enabled_ = true;
     }
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
     ui::DisableTestCompositor();
     command_line->AppendSwitchASCII(switches::kWindowSize, "400,300");
   }
 
   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.
   void RunTest(const FilePath& url,
                const char* expected_reply,
                bool new_tab) {
 #if defined(OS_LINUX) && !defined(NDEBUG)
     // Bypass tests on GPU Linux Debug bots.
     if (gpu_enabled_)
       return;
@@ skipping 335 matching lines @@
   // indicate that the renderer is not simply spinning on RAF.
   EXPECT_GT(stats.mean_us, 15000.0);
 
   // Print out the trace events upon error to debug failures.
   if (stats.mean_us <= 15000.0) {
     fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str());
   }
 }
 
 }  // namespace anonymous