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

Unified Diff: content/test/gpu/gpu_test_expectations_parser.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: namespace fixup 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 | « content/test/data/gpu/webgl_conformance_test_expectations.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/gpu/gpu_test_expectations_parser.cc
diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc
index 8caedc74ee078dba8ef35d063b110a5f02e568c4..756239d9f1f05544cb20b5503a695eb6d0954b35 100644
--- a/content/test/gpu/gpu_test_expectations_parser.cc
+++ b/content/test/gpu/gpu_test_expectations_parser.cc
@@ -12,6 +12,7 @@
#include "base/string_split.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
+#include "content/public/common/content_paths.h"
namespace {
@@ -499,11 +500,9 @@ bool GPUTestExpectationsParser::GetExpectationsPath(
bool rt = true;
switch (profile) {
case kWebGLConformanceTest:
- rt = PathService::Get(base::DIR_SOURCE_ROOT, path);
+ rt = PathService::Get(content::DIR_TEST_DATA, path);
if (rt) {
- *path = path->Append(FILE_PATH_LITERAL("chrome"))
- .Append(FILE_PATH_LITERAL("test"))
- .Append(FILE_PATH_LITERAL("gpu"))
+ *path = path->Append(FILE_PATH_LITERAL("gpu"))
.Append(FILE_PATH_LITERAL(
"webgl_conformance_test_expectations.txt"));
rt = file_util::PathExists(*path);
« no previous file with comments | « content/test/data/gpu/webgl_conformance_test_expectations.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698