Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6773)

Unified Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 10908110: Move gpu blacklist to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/gpu/gpu_blacklist.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc (revision 155054)
+++ chrome/test/gpu/gpu_feature_browsertest.cc (working copy)
@@ -8,7 +8,6 @@
#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"
@@ -67,10 +66,7 @@
}
void SetupBlacklist(const std::string& json_blacklist) {
- GpuBlacklist* blacklist = GpuBlacklist::GetInstance();
- ASSERT_TRUE(blacklist->LoadGpuBlacklist(
- json_blacklist, GpuBlacklist::kAllOs));
- blacklist->UpdateGpuDataManager();
+ GpuDataManager::GetInstance()->Initialize("0", json_blacklist);
}
// If expected_reply is NULL, we don't check the reply content.
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/gpu/gpu_blacklist.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698