| Index: base/base_paths_posix.cc
|
| diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc
|
| index 710d799723fbe67c1ef9c4809fa4326e502026db..84120097d6f1f4668fbfd3d386a4b271f31474c2 100644
|
| --- a/base/base_paths_posix.cc
|
| +++ b/base/base_paths_posix.cc
|
| @@ -12,7 +12,7 @@
|
| #include <sys/sysctl.h>
|
| #endif
|
|
|
| -#include "base/env_var.h"
|
| +#include "base/environment.h"
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| #include "base/logging.h"
|
| @@ -61,7 +61,7 @@ bool PathProviderPosix(int key, FilePath* result) {
|
| case base::DIR_SOURCE_ROOT: {
|
| // Allow passing this in the environment, for more flexibility in build
|
| // tree configurations (sub-project builds, gyp --output_dir, etc.)
|
| - scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
|
| + scoped_ptr<base::Environment> env(base::Environment::Create());
|
| std::string cr_source_root;
|
| if (env->GetEnv("CR_SOURCE_ROOT", &cr_source_root)) {
|
| path = FilePath(cr_source_root);
|
| @@ -104,7 +104,7 @@ bool PathProviderPosix(int key, FilePath* result) {
|
| return false;
|
| }
|
| case base::DIR_USER_CACHE:
|
| - scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
|
| + scoped_ptr<base::Environment> env(base::Environment::Create());
|
| FilePath cache_dir(base::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
|
| ".cache"));
|
| *result = cache_dir;
|
|
|