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

Unified Diff: gpu/config/gpu_test_expectations_parser.cc

Issue 15827008: Move gpu_test_config stuff from content/ to gpu/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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 | « gpu/config/gpu_test_expectations_parser.h ('k') | gpu/config/gpu_test_expectations_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_test_expectations_parser.cc
===================================================================
--- gpu/config/gpu_test_expectations_parser.cc (revision 202179)
+++ gpu/config/gpu_test_expectations_parser.cc (working copy)
@@ -2,18 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/test/gpu/gpu_test_expectations_parser.h"
+#include "gpu/config/gpu_test_expectations_parser.h"
-#include "base/base_paths.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/path_service.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_split.h"
-#include "content/public/common/content_paths.h"
+namespace gpu {
+
namespace {
enum LineParserStage {
@@ -199,14 +198,6 @@
return LoadTestExpectations(data);
}
-bool GPUTestExpectationsParser::LoadTestExpectations(
- GPUTestProfile profile) {
- base::FilePath path;
- if (!GetExpectationsPath(profile, &path))
- return false;
- return LoadTestExpectations(path);
-}
-
int32 GPUTestExpectationsParser::GetTestExpectation(
const std::string& test_name,
const GPUTestBotConfig& bot_config) const {
@@ -503,30 +494,10 @@
message.c_str()));
}
-// static
-bool GPUTestExpectationsParser::GetExpectationsPath(
- GPUTestProfile profile, base::FilePath* path) {
- DCHECK(path);
-
- bool rt = true;
- switch (profile) {
- case kWebGLConformanceTest:
- rt = PathService::Get(content::DIR_TEST_DATA, path);
- if (rt) {
- *path = path->Append(FILE_PATH_LITERAL("gpu"))
- .Append(FILE_PATH_LITERAL(
- "webgl_conformance_test_expectations.txt"));
- rt = file_util::PathExists(*path);
- }
- break;
- default:
- DCHECK(false);
- }
- return rt;
-}
-
GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
: test_expectation(0),
line_number(0) {
}
+} // namespace gpu
+
« no previous file with comments | « gpu/config/gpu_test_expectations_parser.h ('k') | gpu/config/gpu_test_expectations_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698