Move gpu_test_config stuff from content/ to gpu/

gpu/config/gpu_test_expectations_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 {
   kLineParserBegin = 0,
   kLineParserBugID,
   kLineParserConfigs,
   kLineParserColon,
   kLineParserTestName,
   kLineParserEqual,
@@ skipping 166 matching lines @@
   error_messages_.clear();
 
   std::string data;
   if (!file_util::ReadFileToString(path, &data)) {
     error_messages_.push_back(kErrorMessage[kErrorFileIO]);
     return false;
   }
   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 {
   for (size_t i = 0; i < entries_.size(); ++i) {
     if (NamesMatching(entries_[i].test_name, test_name) &&
         bot_config.Matches(entries_[i].test_config))
       return entries_[i].test_expectation;
   }
   return kGpuTestPass;
 }
@@ skipping 276 matching lines @@
     const std::string& message,
     size_t entry1_line_number,
     size_t entry2_line_number) {
   error_messages_.push_back(
       base::StringPrintf("Line %d and %d : %s",
                          static_cast<int>(entry1_line_number),
                          static_cast<int>(entry2_line_number),
                          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
+