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

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

Issue 10984040: Enable gpu crash tests in content (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: refine 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
Index: chrome/test/gpu/gpu_feature_browsertest.cc
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 6fba303a42aaa19be053305db91592d1c8a13b7b..2088258812f6d87f399ef2311d2a86fbc62c7ccc 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -21,6 +21,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/gpu_info.h"
#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_launcher_utils.h"
#include "content/test/gpu/gpu_test_config.h"
#include "content/test/gpu/test_switches.h"
#include "net/base/net_util.h"
@@ -61,7 +62,7 @@ class GpuFeatureTest : public InProcessBrowserTest {
// Do not use mesa if real GPU is required.
if (!command_line->HasSwitch(switches::kUseGpuInTests)) {
#if !defined(OS_MACOSX)
- CHECK(test_launcher_utils::OverrideGLImplementation(
+ CHECK(content::OverrideGLImplementation(
command_line, gfx::kGLImplementationOSMesaName)) <<
"kUseGL must not be set by test framework code!";
#endif

Powered by Google App Engine
This is Rietveld 408576698