Revert 270872 "Move all callers of GetHomeDir() to PathService::..."

trunk/src/rlz/chromeos/lib/rlz_value_store_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
 
-#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "rlz/lib/lib_values.h"
 #include "rlz/lib/recursive_cross_process_lock_posix.h"
 #include "rlz/lib/rlz_lib.h"
 
 namespace rlz_lib {
 
 namespace {
@@ skipping 13 matching lines @@
 
 // RLZ store lock filename
 const base::FilePath::CharType kRLZLockFileName[] =
     FILE_PATH_LITERAL("RLZ Data.lock");
 
 // RLZ store path for testing.
 base::FilePath g_testing_rlz_store_path_;
 
 // Returns file path of the RLZ storage.
 base::FilePath GetRlzStorePath() {
-  base::FilePath homedir;
-  PathService::Get(base::DIR_HOME, &homedir);
   return g_testing_rlz_store_path_.empty() ?
-      homedir.Append(kRLZDataFileName) :
+      base::GetHomeDir().Append(kRLZDataFileName) :
       g_testing_rlz_store_path_.Append(kRLZDataFileName);
 }
 
 // Returns file path of the RLZ storage lock file.
 base::FilePath GetRlzStoreLockPath() {
-  base::FilePath homedir;
-  PathService::Get(base::DIR_HOME, &homedir);
   return g_testing_rlz_store_path_.empty() ?
-      homedir.Append(kRLZLockFileName) :
+      base::GetHomeDir().Append(kRLZLockFileName) :
       g_testing_rlz_store_path_.Append(kRLZLockFileName);
 }
 
 // Returns the dictionary key for storing access point-related prefs.
 std::string GetKeyName(std::string key, AccessPoint access_point) {
   std::string brand = SupplementaryBranding::GetBrand();
   if (brand.empty())
     brand = kNoSupplementaryBrand;
   return key + "." + GetAccessPointName(access_point) + "." + brand;
 }
@@ skipping 263 matching lines @@
   g_testing_rlz_store_path_ = directory;
 }
 
 std::string RlzStoreFilenameStr() {
   return GetRlzStorePath().value();
 }
 
 }  // namespace testing
 
 }  // namespace rlz_lib