| Index: base/path_service.cc
|
| diff --git a/base/path_service.cc b/base/path_service.cc
|
| index 75833db9a111b70ac5dcc64cd684779c5d462d3d..61488d6f75ff4acd8becef175e353a8496b6a421 100644
|
| --- a/base/path_service.cc
|
| +++ b/base/path_service.cc
|
| @@ -233,15 +233,13 @@
|
|
|
| // static
|
| bool PathService::Override(int key, const FilePath& path) {
|
| - // Just call the full function with true for the value of |create|, and
|
| - // assume that |path| may not be absolute yet.
|
| - return OverrideAndCreateIfNeeded(key, path, false, true);
|
| + // Just call the full function with true for the value of |create|.
|
| + return OverrideAndCreateIfNeeded(key, path, true);
|
| }
|
|
|
| // static
|
| bool PathService::OverrideAndCreateIfNeeded(int key,
|
| const FilePath& path,
|
| - bool is_absolute,
|
| bool create) {
|
| PathData* path_data = GetPathData();
|
| DCHECK(path_data);
|
| @@ -261,12 +259,9 @@
|
| }
|
|
|
| // We need to have an absolute path.
|
| - if (!is_absolute) {
|
| - file_path = MakeAbsoluteFilePath(file_path);
|
| - if (file_path.empty())
|
| - return false;
|
| - }
|
| - DCHECK(file_path.IsAbsolute());
|
| + file_path = MakeAbsoluteFilePath(file_path);
|
| + if (file_path.empty())
|
| + return false;
|
|
|
| base::AutoLock scoped_lock(path_data->lock);
|
|
|
|
|