diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 00:40:04 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 00:40:04 +0000 |
| commit | c4803e43232864180e5db4fb3b8d185dc0c5ba84 (patch) | |
| tree | b22d2ccf1a6f384698261627d91c55838d815657 /base/base_paths.cc | |
| parent | 33c867665307e75078bea129ea7cf2a94fda1395 (diff) | |
| download | chromium_src-c4803e43232864180e5db4fb3b8d185dc0c5ba84.zip chromium_src-c4803e43232864180e5db4fb3b8d185dc0c5ba84.tar.gz chromium_src-c4803e43232864180e5db4fb3b8d185dc0c5ba84.tar.bz2 | |
base: Move the rest of JSONValueSerializer unit tests from c/common to base/json.
This is the follow up patch to r189315 - https://codereview.chromium.org/12910004
where we moved the half of tests that didn't depend on json test files.
json_value_serializer_perftest.cc was not moved yet because it depends on
chrome/common/logging_chrome.h
TEST=base_unittests --gtest_filter=*JSON*
TEST=perf_tests --gtest_filter=JSONValueSerializerTests*
R=darin@chromium.org,bulach@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12481028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_paths.cc')
| -rw-r--r-- | base/base_paths.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/base/base_paths.cc b/base/base_paths.cc index 05a55af..b90efba 100644 --- a/base/base_paths.cc +++ b/base/base_paths.cc @@ -15,18 +15,27 @@ bool PathProvider(int key, FilePath* result) { FilePath cur; switch (key) { - case base::DIR_EXE: - PathService::Get(base::FILE_EXE, &cur); + case DIR_EXE: + PathService::Get(FILE_EXE, &cur); cur = cur.DirName(); break; - case base::DIR_MODULE: - PathService::Get(base::FILE_MODULE, &cur); + case DIR_MODULE: + PathService::Get(FILE_MODULE, &cur); cur = cur.DirName(); break; - case base::DIR_TEMP: + case DIR_TEMP: if (!file_util::GetTempDir(&cur)) return false; break; + case DIR_TEST_DATA: + if (!PathService::Get(DIR_SOURCE_ROOT, &cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("base")); + cur = cur.Append(FILE_PATH_LITERAL("test")); + cur = cur.Append(FILE_PATH_LITERAL("data")); + if (!file_util::PathExists(cur)) // We don't want to create this. + return false; + break; default: return false; } |