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

Unified Diff: base/base_paths.cc

Issue 12481028: base: Move the rest of JSONValueSerializer unit tests from c/common to base/json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change the extension to json Created 7 years, 9 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 | « base/base_paths.h ('k') | base/json/json_value_serializer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_paths.cc
diff --git a/base/base_paths.cc b/base/base_paths.cc
index 05a55af66b7439b834d4130b36920ec2a46d24b8..b90efba0fffb440a02ddeaf3cf05f229574d14ad 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:
M-A Ruel 2013/04/04 14:48:06 This broke isolated testing. I'll send a follow up
+ 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;
}
« no previous file with comments | « base/base_paths.h ('k') | base/json/json_value_serializer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698