chrome/test/gpu/gpu_feature_browsertest.cc - Issue 10916334: Enable webgl conformance tests under content/test/gpu in content_browsertests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10916334: Enable webgl conformance tests under content/test/gpu in content_browsertests (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: directory change and remove duplicate code 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/test/gpu/gpu_crash_browsertest.cc ('k') | chrome/test/gpu/gpu_mapsgl_endurance_browsertest.cc » ('j') | content/browser/gpu/webgl_conformance_tests.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 384f0c4c9134bb9c4558855640467b9eefb47003..bc743a02d17485936297a33efe2cb03e8b8dd5eb 100644

--- a/chrome/test/gpu/gpu_feature_browsertest.cc

+++ b/chrome/test/gpu/gpu_feature_browsertest.cc

@@ -20,6 +20,7 @@

#include "content/public/browser/gpu_data_manager.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/gpu_info.h"

+#include "content/public/test/browser_test_utils.h"

#include "content/test/gpu/gpu_test_config.h"

#include "content/test/gpu/test_switches.h"

#include "net/base/net_util.h"

@@ -89,7 +90,7 @@ class GpuFeatureTest : public InProcessBrowserTest {

ASSERT_TRUE(file_util::PathExists(test_path))

<< "Missing test file: " << test_path.value();

- ui_test_utils::DOMMessageQueue message_queue;

+ content::DOMMessageQueue message_queue;

if (new_tab) {

ui_test_utils::NavigateToURLWithDisposition(

browser(), net::FilePathToFileURL(test_path),