Chromium Code Reviews| Index: components/json_schema/json_schema_validator_unittest_base.cc |
| diff --git a/chrome/common/json_schema/json_schema_validator_unittest_base.cc b/components/json_schema/json_schema_validator_unittest_base.cc |
| similarity index 98% |
| rename from chrome/common/json_schema/json_schema_validator_unittest_base.cc |
| rename to components/json_schema/json_schema_validator_unittest_base.cc |
| index 0f87a48e45e332910d8e9a5cb39e2acb52e2acfd..fa250cc493c5d53a3d0392003f99091c7f2a55dc 100644 |
| --- a/chrome/common/json_schema/json_schema_validator_unittest_base.cc |
| +++ b/components/json_schema/json_schema_validator_unittest_base.cc |
| @@ -2,12 +2,13 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/common/json_schema/json_schema_validator_unittest_base.h" |
| +#include "components/json_schema/json_schema_validator_unittest_base.h" |
| #include <cfloat> |
| #include <cmath> |
| #include <limits> |
| +#include "base/base_paths.h" |
| #include "base/file_util.h" |
| #include "base/json/json_file_value_serializer.h" |
| #include "base/logging.h" |
| @@ -15,9 +16,8 @@ |
| #include "base/path_service.h" |
| #include "base/strings/stringprintf.h" |
| #include "base/values.h" |
| -#include "chrome/common/chrome_paths.h" |
| -#include "chrome/common/json_schema/json_schema_constants.h" |
| -#include "chrome/common/json_schema/json_schema_validator.h" |
| +#include "components/json_schema/json_schema_constants.h" |
| +#include "components/json_schema/json_schema_validator.h" |
| namespace schema = json_schema_constants; |
| @@ -27,8 +27,12 @@ namespace { |
| base::Value* LoadValue(const std::string& filename) { |
| base::FilePath path; |
| - PathService::Get(chrome::DIR_TEST_DATA, &path); |
| - path = path.AppendASCII("json_schema_validator").AppendASCII(filename); |
| + PathService::Get(base::DIR_SOURCE_ROOT, &path); |
| + path = path.AppendASCII("chrome") |
|
Jói
2013/08/13 09:46:52
The test data should move from //chrome/test/data
Joao da Silva
2013/08/13 11:34:02
Done.
|
| + .AppendASCII("test") |
| + .AppendASCII("data") |
| + .AppendASCII("json_schema_validator") |
| + .AppendASCII(filename); |
| EXPECT_TRUE(base::PathExists(path)); |
| std::string error_message; |