diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 06:32:59 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 06:32:59 +0000 |
| commit | e0879c19fe65c1455d6eab36a4a01524465ffb08 (patch) | |
| tree | df3400ef596ecf62cc44bbf7687417c2dcbabf3a /crypto/nss_util.cc | |
| parent | cee6a92d0d15ba27677d1f51c0a03d8990832445 (diff) | |
| download | chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.zip chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.tar.gz chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.tar.bz2 | |
Revert 270872 "Move all callers of GetHomeDir() to PathService::..."
> Move all callers of GetHomeDir() to PathService::Get(base::DIR_HOME).
>
> * Fixes GetHomeDir() for multi-profiles case on Chrome OS.
> * Once user signs in on Chrome OS base::DIR_HOME is overridden with primary user homedir.
> * Added content switch --homedir to pass that information to ppapi plugins since they run in a separate process and previous base::DIR_HOME override does not apply there.
>
> This fix doesn't require checking for --multi-profiles switch
> since user_id hash is known even without it.
>
> BUG=331530
> TBR=vitalybuka@chromium.org
>
> Review URL: https://codereview.chromium.org/200473002
This test has caused two tests to start failing on the chromeos valgrind bots:
http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%286%29/builds/25884
http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%285%29/builds/26990
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/284333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 5958ad9..da46b63 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -21,7 +21,6 @@ #include <map> #include <vector> -#include "base/base_paths.h" #include "base/bind.h" #include "base/cpu.h" #include "base/debug/alias.h" @@ -35,7 +34,6 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/native_library.h" -#include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_checker.h" @@ -82,8 +80,7 @@ std::string GetNSSErrorMessage() { #if defined(USE_NSS) base::FilePath GetDefaultConfigDirectory() { - base::FilePath dir; - PathService::Get(base::DIR_HOME, &dir); + base::FilePath dir = base::GetHomeDir(); if (dir.empty()) { LOG(ERROR) << "Failed to get home directory."; return dir; |